X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=cd95e7017bfd9e20ed50d7f1522207c52915bb60;hb=b9d610a9e522d71a89d2daeb6f71b2bc2a71cdf7;hp=add2505b7a59122c427cd312751819d390440bc8;hpb=b49d59f6da3513b78361a4f0123d62b10c630815;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index add2505b..cd95e701 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.8.2 + packer-version: 1.9.1 ##################### # Job Configuration # @@ -101,7 +101,7 @@ disable-job: false github-url: "https://github.com" jjb-cache: "$HOME/.cache/jenkins_jobs" - jjb-version: 5.0.1 + jjb-version: 6.0.0 stream: master submodule-recursive: true submodule-timeout: 10 @@ -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}" @@ -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 @@ -2234,6 +2239,7 @@ 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 name: lf-sonar-builders-prescan @@ -2261,6 +2267,7 @@ 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 name: lf-sonar-gerrit-common