Optimize the jjb-deploy trigger regex

[releng/global-jjb.git] / jjb / lf-ci-jobs.yaml

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index c34f63d..925ec4e 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -506,7 +506,7 @@
           url: '{git-clone-url}{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '$sha1'
-          submodule-recursive: '{submodule-recursive}'
+          submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -598,7 +598,7 @@
     submodule-timeout: 10
     gerrit_jjb_deploy_job_triggers:
       - comment-added-contains-event:
-          comment-contains-value: 'jjb-deploy[:]* (?!\*+$).+$'
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(jjb-deploy[:]* (?!\*+$).+$)'
 
     #####################
     # Job Configuration #
@@ -1402,6 +1402,8 @@
           packer-version: '{packer-version}'
           platform: '{platforms}'
           template: '{templates}'
+      - description-setter:
+          description: '.*Creating the image:(.*)'
 
 - job-template:
     name: '{project-name}-packer-merge-{platforms}-{templates}'