X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=5019cb982f47b141e481a4d91d0a0eb6fca3dc8c;hb=cc9776d38d1d5a25a9c27af4501dda47318e09aa;hp=8a49d0368e295cda6416ce71b69f542dce78d96b;hpb=d0b4b64aa4c1ced7c3c07b5fb8f50613e40b3baa;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 8a49d036..5019cb98 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -38,7 +38,7 @@
     submodule-recursive: true
     submodule-timeout: 10
     packer-cloud-settings: packer-cloud-env
-    packer-version: 1.2.5
+    packer-version: 1.4.0
 
     #####################
     # Job Configuration #
@@ -484,11 +484,11 @@
     scm:
       - lf-infra-gerrit-scm:
           git-url: '{git-url}'
-          refspec: 'refs/heads/{branch}'
-          branch: '{branch}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
-          choosing-strategy: default
+          choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
@@ -719,6 +719,8 @@
     # Default parameters #
     ######################
 
+    jjb-workers: 0
+
     gerrit_merge_triggers:
       - change-merged-event
       - comment-added-contains-event:
@@ -731,6 +733,8 @@
     builders:
       - lf-infra-pre-build
       - lf-infra-jjbini
+      - inject:
+          properties-content: JJB_WORKERS={jjb-workers}
       - shell: !include-raw-escape:
           - ../shell/jjb-install.sh
           - ../shell/jjb-merge-job.sh
@@ -1445,7 +1449,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
-          choosing-strategy: gerrit
+          choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers: