X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=6aa84fd12487a4cb4ae1e0d349ec047dacad292e;hb=21fb4ad7453a9452de6f33e83021a3ff09b06be9;hp=689892bf80e4c3d9a547a22658659e972181d539;hpb=048aff89d28864363ba051c7624d280368e362d3;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 689892bf..6aa84fd1 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -30,7 +30,7 @@
     submodule-disable: false
     packer-builder: openstack
     packer-cloud-settings: packer-cloud-env
-    packer-version: 1.4.2
+    packer-version: 1.6.6
 
     #####################
     # Job Configuration #
@@ -670,7 +670,7 @@
                 - branch-compare-type: ANT
                   branch-pattern: "**"
           skip-vote:
-            success: true
+            successful: true
             failed: true
             unstable: true
             notbuilt: true
@@ -1492,16 +1492,6 @@
       - description-setter:
           regexp: '(\s+.*)(ZZCI\s+.*\d+-\d+\.\d+)'
           description: 'Image: \2'
-      # - trigger-builds:
-      #     - project: '{project-name}-openstack-update-cloud-image'
-      #       block: false
-      #       predefined-parameters: |
-      #         GERRIT_BRANCH=$GERRIT_BRANCH
-      #         GERRIT_PROJECT=$GERRIT_PROJECT
-      #         GERRIT_REFSPEC=$GERRIT_REFSPEC
-      #         NEW_IMAGE_NAME=$NEW_IMAGE_NAME
-      #       property-file: variables.jenkins-trigger
-      #       property-file-fail-on-missing: true
 
     publishers:
       - lf-infra-publish
@@ -1572,6 +1562,14 @@
                   pattern: 'packer\/templates\/{templates}\.json'
                 - compare-type: REG_EXP
                   pattern: 'packer\/vars\/{platforms}\.json'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/provision\/{templates}\.yaml'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/provision\/local-{templates}\.yaml'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/templates\/{templates}\.json'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/vars\/{platforms}\.json'
 
 - job-template:
     name: "{project-name}-packer-merge-{platforms}-{templates}"
@@ -1629,6 +1627,11 @@
             - 'packer\/provision\/local-{templates}\.yaml'
             - 'packer\/templates\/{templates}\.json'
             - 'packer\/vars\/{platforms}\.json'
+            - 'packer\/common-packer\/provision\/{templates}\.yaml'
+            - 'packer\/common-packer\/provision\/local-{templates}\.yaml'
+            - 'packer\/common-packer\/templates\/{templates}\.json'
+            - 'packer\/common-packer\/vars\/{platforms}\.json'
+
           white-list-target-branches:
             - "{branch}"
 
@@ -1689,6 +1692,14 @@
                   pattern: 'packer\/templates\/{templates}\.json'
                 - compare-type: REG_EXP
                   pattern: 'packer\/vars\/{platforms}\.json'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/provision\/{templates}\.yaml'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/provision\/local-{templates}\.yaml'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/templates\/{templates}\.json'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/vars\/{platforms}\.json'
 
 - job-template:
     name: "{project-name}-packer-verify-build-{platforms}-{templates}"
@@ -1737,6 +1748,10 @@
             - 'packer\/provision\/local-{templates}\.yaml'
             - 'packer\/templates\/{templates}\.json'
             - 'packer\/vars\/{platforms}\.json'
+            - 'packer\/common-packer\/vars\/{platforms}\.json'
+            - 'packer\/common-packer\/provision\/{templates}\.yaml'
+            - 'packer\/common-packer\/provision\/local-{templates}\.yaml'
+            - 'packer\/common-packer\/templates\/{templates}\.json'
 
 #################
 # Packer Verify #
@@ -1781,7 +1796,6 @@
           openstack: "{openstack}"
           openstack-cloud: "{openstack-cloud}"
           packer-cloud-settings: "{packer-cloud-settings}"
-          packer-builder: "{packer-builder}"
           packer-version: "{packer-version}"
 
 - job-template: