X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=0749529c4003ebf525e4fac705f328d407901dda;hb=7b53496161eb257924609d83e1cb3cea47127bd2;hp=026dbf0130e438635ab3b4213945cc5e3d221f06;hpb=391e8138f528a720604ed9da7bda949b5e56fbec;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 026dbf01..0749529c 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -2,8 +2,6 @@
 - job-group:
     name: '{project-name}-ci-jobs'
 
-    jjb-version: 1.6.2
-
     jobs:
       - gerrit-jjb-deploy-job
       - gerrit-jjb-merge
@@ -12,8 +10,6 @@
 - job-group:
     name: '{project-name}-github-ci-jobs'
 
-    jjb-version: 1.6.2
-
     jobs:
       - github-jjb-deploy-job
       - github-jjb-merge
@@ -22,7 +18,7 @@
 - job-group:
     name: '{project-name}-packer-jobs'
 
-    packer-version: 1.0.2
+    packer-version: 1.1.1
 
     jobs:
       - gerrit-packer-merge
@@ -32,7 +28,7 @@
 - job-group:
     name: '{project-name}-github-packer-jobs'
 
-    packer-version: 1.0.2
+    packer-version: 1.1.1
 
     jobs:
       - github-packer-merge
@@ -140,6 +136,7 @@
 
     branch: master
     build-timeout: 10
+    jjb-version: 1.6.2
     stream: master
     submodule-recursive: true
 
@@ -340,7 +337,7 @@
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '{branch}'
+          branch: '$sha1'
           submodule-recursive: true
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -429,7 +426,7 @@
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
           refspec: ''
-          branch: '{branch}'
+          branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -528,7 +525,7 @@
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '{branch}'
+          branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -622,7 +619,7 @@
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
           refspec: ''
-          branch: '{branch}'
+          branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -730,7 +727,7 @@
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '{branch}'
+          branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'