X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=cd95e7017bfd9e20ed50d7f1522207c52915bb60;hb=5d336574e77fb349ace15356ef8ffb816d463544;hp=09a76a10f6c1125f6585cfa13cd6925c652dd2f3;hpb=b1dc155b19de6dec476a5037cee96721f2c750b1;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 09a76a10..cd95e701 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.
 
     ######################
@@ -30,7 +30,7 @@
     submodule-disable: false
     packer-builder: openstack
     packer-cloud-settings: packer-cloud-env
-    packer-version: 1.8.2
+    packer-version: 1.9.1
 
     #####################
     # Job Configuration #
@@ -89,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
 
     ######################
@@ -101,7 +101,7 @@
     disable-job: false
     github-url: "https://github.com"
     jjb-cache: "$HOME/.cache/jenkins_jobs"
-    jjb-version: 4.1.0
+    jjb-version: 6.0.0
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -258,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
 
     ######################
@@ -397,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
 
     ######################
@@ -534,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
 
     ######################
@@ -586,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
 
     ######################
@@ -715,7 +715,7 @@
 # JJB Merge #
 #############
 
-- lf_jjb_merge: &lf_jjb_merge
+- _lf_jjb_merge: &lf_jjb_merge
     name: lf-jjb-merge
 
     ######################
@@ -824,7 +824,7 @@
 # JJB Verify #
 ##############
 
-- lf_jjb_verify: &lf_jjb_verify
+- _lf_jjb_verify: &lf_jjb_verify
     name: lf-jjb-verify
 
     ######################
@@ -950,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
 
     #####################
@@ -1063,7 +1063,7 @@
 # License Check #
 #################
 
-- lf_license_check: &lf_license_check
+- _lf_license_check: &lf_license_check
     name: lf-license-check
 
     ######################
@@ -1201,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
 
     ######################
@@ -1301,7 +1301,7 @@
 # OPENSTACK CRON #
 ##################
 
-- lf_openstack_cron: &lf_openstack_cron
+- _lf_openstack_cron: &lf_openstack_cron
     name: lf-openstack-cron
 
     ######################
@@ -1458,7 +1458,7 @@
 # Packer Merge #
 ################
 
-- lf_packer_merge: &lf_packer_merge
+- _lf_packer_merge: &lf_packer_merge
     name: lf-packer-merge
 
     ######################
@@ -1576,6 +1576,10 @@
                   pattern: 'packer\/common-packer\/templates\/{templates}\.json'
                 - compare-type: REG_EXP
                   pattern: 'packer\/common-packer\/vars\/{platforms}\.json'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/templates\/{templates}\.hcl'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/vars\/{platforms}\.pkrvars.hcl'
 
 - job-template:
     name: "{project-name}-packer-merge-{platforms}-{templates}"
@@ -1763,7 +1767,7 @@
 # Packer Verify #
 #################
 
-- lf_packer_verify: &lf_packer_verify
+- _lf_packer_verify: &lf_packer_verify
     name: lf-packer-verify
 
     ######################
@@ -1888,7 +1892,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
 
     ######################
@@ -2005,7 +2009,7 @@
 # Puppet Verify #
 #################
 
-- lf_puppet_verify: &lf_puppet_verify
+- _lf_puppet_verify: &lf_puppet_verify
     name: lf-puppet-verify
 
     ######################
@@ -2153,7 +2157,7 @@
 # Sonar #
 #########
 
-- lf_sonar_common: &lf_sonar_common
+- _lf_sonar_common: &lf_sonar_common
     name: lf-sonar-common
 
     ######################
@@ -2170,7 +2174,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
-    sonarcloud-java-version: openjdk11
+    sonarcloud-java-version: openjdk17
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -2182,6 +2186,7 @@
     sonar-properties: ""
     sonar-java-opts: ""
     sonar-additional-args: ""
+    sonar-jdk: openjdk17
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -2222,7 +2227,7 @@
     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
@@ -2234,8 +2239,9 @@
           sonar-properties: "{sonar-properties}"
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
+          sonar-jdk: "{sonar-jdk}"
 
-- 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
@@ -2248,7 +2254,7 @@
           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
@@ -2261,8 +2267,9 @@
           sonar-properties: "{sonar-properties}"
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
+          sonar-jdk: "{sonar-jdk}"
 
-- 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:
@@ -2297,7 +2304,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:
@@ -2385,7 +2392,7 @@
 # Pipelines #
 #############
 
-- lf_pipelines_common: &lf_pipelines_common
+- _lf_pipelines_common: &lf_pipelines_common
     name: lf-pipelines-common
 
     ######################
@@ -2400,7 +2407,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