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

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 8e3d4d9e..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:
@@ -273,9 +281,19 @@
     ######################
 
     branch: master
+    cron: '@daily'
     git-url: '$GIT_URL/$GERRIT_PROJECT'
     jenkins-silos: production sandbox
 
+    gerrit_merge_triggers:
+      - change-merged-event
+      - comment-added-contains-event:
+          comment-contains-value: remerge$
+
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'jenkins-config/**'
+
     #####################
     # Job Configuration #
     #####################
@@ -306,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
@@ -324,6 +344,19 @@
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
+    triggers:
+      - timed: '{obj:cron}'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on: '{obj:gerrit_merge_triggers}'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths: '{obj:gerrit_trigger_file_paths}'
+
 - job-template:
     name: '{project-name}-jenkins-cfg-merge'
     id: github-jenkins-cfg-merge
@@ -336,12 +369,27 @@
     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}'
 
+    triggers:
+      - timed: '{obj:cron}'
+      - github
+      - pollscm:
+          cron: ''
+      - lf-infra-github-pr-trigger:
+          trigger-phrase: '^remerge$'
+          only-trigger-phrase: true
+          status-context: 'Jenkins CFG Merge'
+          permit-all: false
+          github-hooks: true
+          github-org: '{github-org}'
+          github_pr_whitelist: '{obj:github_pr_whitelist}'
+          github_pr_admin_list: '{obj:github_pr_admin_list}'
+
 
 ##################
 # JJB DEPLOY JOB #
@@ -419,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'