X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=6aa84fd12487a4cb4ae1e0d349ec047dacad292e;hb=502523b6c679aea37113ebd6711fbcb9cbae8e1a;hp=1ccb06b79453c87c0fade369af649729181502d6;hpb=aab1a61c174a466a9fb05a32601b5c8610d9ba9b;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 1ccb06b7..6aa84fd1 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -28,8 +28,9 @@
     submodule-recursive: true
     submodule-timeout: 10
     submodule-disable: false
+    packer-builder: openstack
     packer-cloud-settings: packer-cloud-env
-    packer-version: 1.4.2
+    packer-version: 1.6.6
 
     #####################
     # Job Configuration #
@@ -227,6 +228,7 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: "**/{branch}"
+          comment-text-parameter-mode: PLAIN
 
     builders:
       - shell: !include-raw-escape: ../shell/gerrit-branch-lock.sh
@@ -623,6 +625,9 @@
           project: "{project}"
           stream: "{stream}"
           branch: "{branch}"
+      - lf-infra-jjb-parameters:
+          jjb-cache: "{jjb-cache}"
+          jjb-version: "{jjb-version}"
 
     wrappers:
       - lf-infra-wrappers:
@@ -639,6 +644,8 @@
 - job-template:
     name: "{project-name}-jjb-deploy-job"
     id: gerrit-jjb-deploy-job
+    <<: *lf_jjb_common
+    # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_deploy_job
 
     scm:
@@ -663,14 +670,17 @@
                 - branch-compare-type: ANT
                   branch-pattern: "**"
           skip-vote:
-            success: true
+            successful: true
             failed: true
             unstable: true
             notbuilt: true
+          comment-text-parameter-mode: PLAIN
 
 - job-template:
     name: "{project-name}-jjb-deploy-job"
     id: github-jjb-deploy-job
+    <<: *lf_jjb_common
+    # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_deploy_job
 
     properties:
@@ -1402,6 +1412,9 @@
 
     publishers:
       - lf-infra-publish
+      - global-jjb-email-notification:
+          email-recipients: "{failure-notification}"
+          email-prefix: "{failure-notification-prefix}"
 
 - job-template:
     name: "{project-name}-openstack-cron"
@@ -1470,6 +1483,7 @@
       - lf-infra-packer-build:
           openstack: "{openstack}"
           openstack-cloud: "{openstack-cloud}"
+          packer-builder: "{packer-builder}"
           packer-cloud-settings: "{packer-cloud-settings}"
           packer-version: "{packer-version}"
           platform: "{platforms}"
@@ -1478,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
@@ -1558,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}"
@@ -1615,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}"
 
@@ -1675,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}"
@@ -1723,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 #