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

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 558d3858..41eb6da6 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 #
@@ -105,7 +102,7 @@
           stream: '{stream}'
           branch: '{branch}'
           lftools-version: '{lftools-version}'
-      - lf-infra-packer-parameters:
+      - lf-packer-parameters:
           packer-version: '{packer-version}'
 
     wrappers:
@@ -125,7 +122,7 @@
           description: Jenkins Job Builder version to download and install.
 
 - parameter:
-    name: lf-infra-packer-parameters
+    name: lf-packer-parameters
     parameters:
       - string:
           name: PACKER_VERSION
@@ -141,13 +138,15 @@
 
     branch: master
     build-timeout: 10
-    jjb-version: 1.6.2
+    jjb-version: 2.0.5
     stream: master
     submodule-recursive: true
 
     gerrit_trigger_file_paths:
       - compare-type: ANT
         pattern: '**/*.sh'
+      - compare-type: ANT
+        pattern: '**/*.yml'
       - compare-type: ANT
         pattern: '**/*.yaml'
       - compare-type: ANT
@@ -256,6 +255,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 +324,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
@@ -359,8 +369,8 @@
     scm:
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '$sha1'
+          refspec: ''
+          branch: 'refs/heads/{branch}'
           submodule-recursive: true
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -457,6 +467,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'