X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=0bfacdfe7f330036bbef4f422145ba845e1bc982;hb=5e7040b0710c05df16d1815be74214c5eb5f9239;hp=a48f3251baef97078dc0880689f7297e11c45a25;hpb=697cb58821b1738d527ff237b4c4502777908e4b;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index a48f3251..0bfacdfe 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -11,8 +11,8 @@
             - file-id: jjbini
               target: "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
 
-- lf_packer: &lf_packer_common
-    name: lf-packer-common
+- _lf_packer_common: &lf_packer_common
+    name: lf_packer_common
     # Provide configuration common in packer jobs.
 
     ######################
@@ -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.9.1
 
     #####################
     # Job Configuration #
@@ -88,7 +89,7 @@
           default: "{puppet-lint-version}"
           description: Puppet-lint version to download and install.
 
-- lf_jjb_common: &lf_jjb_common
+- _lf_jjb_common: &lf_jjb_common
     name: lf-jjb-common
 
     ######################
@@ -100,7 +101,7 @@
     disable-job: false
     github-url: "https://github.com"
     jjb-cache: "$HOME/.cache/jenkins_jobs"
-    jjb-version: 2.8.0
+    jjb-version: 5.0.4
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -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
@@ -256,7 +258,7 @@
       - shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh
       - shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
 
-- lf_jenkins_configuration: &lf_jenkins_cfg_merge
+- _lf_jenkins_configuration: &lf_jenkins_cfg_merge
     name: lf-jenkins-cfg-merge
 
     ######################
@@ -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:
@@ -395,7 +397,7 @@
 # Jenkins Configuration Management Verify #
 ###########################################
 
-- lf_jenkins_configuration: &lf_jenkins_cfg_verify
+- _lf_jenkins_configuration: &lf_jenkins_cfg_verify
     name: lf-jenkins-cfg-verify
 
     ######################
@@ -532,7 +534,7 @@
 # JENKINS SANDBOX CLEANUP #
 ###########################
 
-- lf_jenkins_sandbox_cleanup: &lf_jenkins_sandbox_cleanup
+- _lf_jenkins_sandbox_cleanup: &lf_jenkins_sandbox_cleanup
     name: lf-jenkins-sandbox-cleanup
 
     ######################
@@ -584,7 +586,7 @@
 # JJB DEPLOY JOB #
 ##################
 
-- lf_jjb_deploy_job: &lf_jjb_deploy_job
+- _lf_jjb_deploy_job: &lf_jjb_deploy_job
     name: lf-jjb-deploy-job
 
     ######################
@@ -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"
@@ -712,7 +715,7 @@
 # JJB Merge #
 #############
 
-- lf_jjb_merge: &lf_jjb_merge
+- _lf_jjb_merge: &lf_jjb_merge
     name: lf-jjb-merge
 
     ######################
@@ -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:
@@ -821,7 +824,7 @@
 # JJB Verify #
 ##############
 
-- lf_jjb_verify: &lf_jjb_verify
+- _lf_jjb_verify: &lf_jjb_verify
     name: lf-jjb-verify
 
     ######################
@@ -947,7 +950,7 @@
 # JJB Verify Upstream GJJB #
 ############################
 
-- lf_jjb_verify: &lf_jjb_verify_upstream_gjjb
+- _lf_jjb_verify: &lf_jjb_verify_upstream_gjjb
     name: lf-jjb-verify-upstream-gjjb
 
     #####################
@@ -1060,7 +1063,7 @@
 # License Check #
 #################
 
-- lf_license_check: &lf_license_check
+- _lf_license_check: &lf_license_check
     name: lf-license-check
 
     ######################
@@ -1198,7 +1201,7 @@
 # Info YAML Verify #
 ####################
 
-- lf_info_yaml_verify: &lf_info_yaml_verify
+- _lf_info_yaml_verify: &lf_info_yaml_verify
     name: lf-info-yaml-verify
 
     ######################
@@ -1298,7 +1301,7 @@
 # OPENSTACK CRON #
 ##################
 
-- lf_openstack_cron: &lf_openstack_cron
+- _lf_openstack_cron: &lf_openstack_cron
     name: lf-openstack-cron
 
     ######################
@@ -1369,6 +1372,12 @@
       - lf-infra-pre-build
       - inject:
           properties-content: OS_CLOUD={openstack-cloud}
+      # K8s Clusters
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: "{openstack-stack-cleanup}"
+          steps:
+            - shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-k8s-clusters.sh
       # Stacks
       - conditional-step:
           condition-kind: boolean-expression
@@ -1409,6 +1418,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"
@@ -1446,7 +1458,7 @@
 # Packer Merge #
 ################
 
-- lf_packer_merge: &lf_packer_merge
+- _lf_packer_merge: &lf_packer_merge
     name: lf-packer-merge
 
     ######################
@@ -1477,6 +1489,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 +1498,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 +1568,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 +1622,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 +1633,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 +1698,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,12 +1754,16 @@
             - '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 #
 #################
 
-- lf_packer_verify: &lf_packer_verify
+- _lf_packer_verify: &lf_packer_verify
     name: lf-packer-verify
 
     ######################
@@ -1860,7 +1888,7 @@
 # Openstack Update Cloud Image #
 ################################
 
-- lf_openstack_cron: &lf_openstack_update_cloud_image
+- _lf_openstack_cron: &lf_openstack_update_cloud_image
     name: lf-openstack-update-cloud-image
 
     ######################
@@ -1977,7 +2005,7 @@
 # Puppet Verify #
 #################
 
-- lf_puppet_verify: &lf_puppet_verify
+- _lf_puppet_verify: &lf_puppet_verify
     name: lf-puppet-verify
 
     ######################
@@ -2125,7 +2153,7 @@
 # Sonar #
 #########
 
-- lf_sonar_common: &lf_sonar_common
+- _lf_sonar_common: &lf_sonar_common
     name: lf-sonar-common
 
     ######################
@@ -2142,6 +2170,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
+    sonarcloud-java-version: openjdk13
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -2193,10 +2222,12 @@
     publishers:
       - lf-infra-publish
 
-- lf_sonar_builders: &lf_sonar_builders
+- _lf_sonar_builders: &lf_sonar_builders
     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}"
@@ -2204,10 +2235,12 @@
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
 
-- lf_sonar_builders_prescan: &lf_sonar_builders_prescan
+- _lf_sonar_builders_prescan: &lf_sonar_builders_prescan
     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}"
@@ -2215,10 +2248,12 @@
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
 
-- lf_sonar_builders_prescan_script: &lf_sonar_builders_prescan_script
+- _lf_sonar_builders_prescan_script: &lf_sonar_builders_prescan_script
     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}"
@@ -2227,7 +2262,7 @@
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
 
-- lf_sonar_gerrit_common: &lf_sonar_gerrit_common
+- _lf_sonar_gerrit_common: &lf_sonar_gerrit_common
     name: lf-sonar-gerrit-common
     gerrit_sonar_triggers:
       - comment-added-contains-event:
@@ -2262,7 +2297,7 @@
             unstable: true
             notbuilt: true
 
-- lf_sonar_github_common: &lf_sonar_github_common
+- _lf_sonar_github_common: &lf_sonar_github_common
     name: lf-sonar-github-common
     properties:
       - lf-infra-properties:
@@ -2350,7 +2385,7 @@
 # Pipelines #
 #############
 
-- lf_pipelines_common: &lf_pipelines_common
+- _lf_pipelines_common: &lf_pipelines_common
     name: lf-pipelines-common
 
     ######################
@@ -2365,7 +2400,7 @@
     submodule-timeout: 10
     submodule-disable: false
 
-- lf_global_pipelines_common: &lf_global_pipelines_common
+- _lf_global_pipelines_common: &lf_global_pipelines_common
     name: lf-global-pipelines-common
 
     # All jobs are triggering from the same source