Chore!: Rename 'whitelist' to 'allowlist'

[releng/global-jjb.git] / jjb / lf-ci-jobs.yaml

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index a48f325..7759168 100644 (file)
--- 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
@@ -385,7 +387,7 @@
           github-hooks: true
           org-list:
             - "{github-org}"
-          white-list: "{obj:github_pr_whitelist}"
+          white-list: "{obj:github_pr_allowlist}"
           admin-list: "{obj:github_pr_admin_list}"
           included-regions: "{obj:github_included_regions}"
           white-list-target-branches:
@@ -668,10 +670,11 @@
                 - 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"
@@ -811,7 +814,7 @@
           github-hooks: true
           org-list:
             - "{github-org}"
-          white-list: "{obj:github_pr_whitelist}"
+          white-list: "{obj:github_pr_allowlist}"
           admin-list: "{obj:github_pr_admin_list}"
           included-regions: "{obj:github_included_regions}"
           white-list-target-branches:
@@ -1409,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"
@@ -1477,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}"
@@ -1485,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
@@ -1565,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}"
@@ -1611,7 +1616,7 @@
           github-hooks: true
           org-list:
             - "{github-org}"
-          white-list: "{obj:github_pr_whitelist}"
+          white-list: "{obj:github_pr_allowlist}"
           admin-list: "{obj:github_pr_admin_list}"
           # included-regions MUST match Gerrit Trigger file-paths
           included-regions:
@@ -1622,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}"
 
@@ -1682,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}"
@@ -1730,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 #
@@ -2142,6 +2164,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
+    sonarcloud-java-version: openjdk11
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -2197,6 +2220,8 @@
     name: lf-sonar-builders
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{sonarcloud-java-version}"
       - lf-infra-sonar:
           sonar-task: "{sonar-task}"
           sonar-project-file: "{sonar-project-file}"
@@ -2208,6 +2233,8 @@
     name: lf-sonar-builders-prescan
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{sonarcloud-java-version}"
       - lf-infra-sonar-with-prescan:
           sonar-task: "{sonar-task}"
           sonar-project-file: "{sonar-project-file}"
@@ -2219,6 +2246,8 @@
     name: lf-sonar-builders-prescan-script
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{sonarcloud-java-version}"
       - shell: "{sonar-prescan-script}"
       - lf-infra-sonar:
           sonar-task: "{sonar-task}"