X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=20382811143c385a011acddca159397ec147fae0;hb=cddcc9d81a2fc6a28f691a2a02d88582f7284bf3;hp=558d385828e553612d4da5561f3ee79a60bd80dc;hpb=2ea5908d7197fd2a895e1992920db2d7cfdf64d7;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 558d3858..20382811 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -20,8 +20,6 @@
 - job-group:
     name: '{project-name}-packer-jobs'
 
-    packer-version: 1.1.3
-
     jobs:
       - gerrit-packer-merge
       - gerrit-packer-verify
@@ -30,8 +28,6 @@
 - job-group:
     name: '{project-name}-github-packer-jobs'
 
-    packer-version: 1.1.3
-
     jobs:
       - github-packer-merge
       - github-packer-verify
@@ -86,6 +82,7 @@
     stream: master
     submodule-recursive: true
     packer-cloud-settings: packer-cloud-env
+    packer-version: 1.2.2
 
     #####################
     # Job Configuration #
@@ -141,7 +138,7 @@
 
     branch: master
     build-timeout: 10
-    jjb-version: 1.6.2
+    jjb-version: 2.0.5
     stream: master
     submodule-recursive: true
 
@@ -256,6 +253,15 @@
 # Jenkins Configuration Management Merge #
 ##########################################
 
+- builder:
+    name: lf-jenkins-cfg-clouds
+    builders:
+      - lf-infra-jjbini
+      - inject:
+          properties-content: 'jenkins_silos={jenkins-silos}'
+      - shell: !include-raw-escape: ../shell/jenkins-configure-clouds.sh
+      - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
+
 - builder:
     name: lf-jenkins-cfg-global-vars
     builders:
@@ -316,6 +322,8 @@
           - ../shell/lftools-install.sh
       - lf-jenkins-cfg-global-vars:
           jenkins-silos: '{jenkins-silos}'
+      - lf-jenkins-cfg-clouds:
+          jenkins-silos: '{jenkins-silos}'
 
     publishers:
       - lf-infra-publish
@@ -457,6 +465,11 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
+          skip-vote:
+            success: true
+            failed: true
+            unstable: true
+            notbuilt: true
 
 - job-template:
     name: '{project-name}-jjb-deploy-job'