Fix: Update lf-infra-sonar macro to use JDK version

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

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 4e1dcf9..4eb134b 100644 (file)
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -30,7 +30,7 @@
 # COMMON FUNCTIONS #
 ####################
 
-- lf_python_common: &lf_python_common
+- _lf_python_common: &lf_python_common
     name: lf-python-common
 
     ######################
@@ -69,7 +69,7 @@
 # Tox Nexus IQ CLM #
 ####################
 
-- lf_tox_nexus_iq_clm: &lf_tox_nexus_iq_clm
+- _lf_tox_nexus_iq_clm: &lf_tox_nexus_iq_clm
     name: lf-tox-nexus-iq-clm
 
     ######################
@@ -231,7 +231,7 @@
 # Python Snyk CLI #
 ###################
 
-- lf_python_snyk_cli: &lf_python_snyk_cli
+- _lf_python_snyk_cli: &lf_python_snyk_cli
     name: lf-python-snyk_cli
 
     ######################
@@ -377,7 +377,7 @@
 # Python Sonar with CLI #
 #########################
 
-- lf_cli_sonar: &lf_cli_sonar
+- _lf_cli_sonar: &lf_cli_sonar
     name: lf-cli-sonar
 
     ######################
@@ -543,7 +543,7 @@
 # Python Sonar with Tox #
 #########################
 
-- lf_tox_sonar: &lf_tox_sonar
+- _lf_tox_sonar: &lf_tox_sonar
     name: lf-tox-sonar
 
     ######################
@@ -562,7 +562,7 @@
     mvn-goals: validate
     mvn-opts: ""
     mvn-params: ""
-    mvn-settings: "{mvn-settings}"
+    mvn-settings: ""
     mvn-version: mvn35
     parallel: true
     pre-build-script: "# pre-build script goes here"
@@ -573,9 +573,8 @@
     sonarcloud-project-organization: ""
     sonarcloud-api-token-cred-id: sonarcloud-api-token
     sonarcloud-qualitygate-wait: false
-    # SonarCloud scan using jdk8 will become deprecated by Oct, 2020
-    # Projects not compatible with jdk11 can set java-version to something else
-    sonarcloud-java-version: openjdk11
+    # Projects not compatible with jdk17 can set java-version to something else
+    sonarcloud-java-version: openjdk17
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -632,7 +631,7 @@
     wrappers:
       - credentials-binding:
           - text:
-              credential-id: '{sonarcloud-api-token-cred-id}'
+              credential-id: "{sonarcloud-api-token-cred-id}"
               variable: API_TOKEN
 
     builders:
@@ -764,7 +763,7 @@
 # Tox SonarQube #
 #################
 
-- lf_tox_sonarqube: &lf_tox_sonarqube
+- _lf_tox_sonarqube: &lf_tox_sonarqube
     name: lf-tox-sonarqube
 
     ######################
@@ -795,6 +794,7 @@
     sonar-project-file: "sonar-project.properties"
     sonar-properties: ""
     sonar-task: ""
+    sonar-jdk: openjdk17
 
     #####################
     # Job Configuration #
@@ -839,6 +839,7 @@
           sonar-properties: "{sonar-properties}"
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
+          sonar-jdk: "{sonar-jdk}"
 
     publishers:
       - lf-infra-publish
@@ -911,7 +912,7 @@
 # Tox Common #
 ##############
 
-- lf_tox_common: &lf_tox_common
+- _lf_tox_common: &lf_tox_common
     name: lf-tox-common
 
     ######################
@@ -1151,7 +1152,7 @@
 # PyPI #
 ########
 
-- lf_pypi_common: &lf_pypi_common
+- _lf_pypi_common: &lf_pypi_common
     name: lf-pypi-common
 
     ######################
@@ -1222,7 +1223,7 @@
     publishers:
       - lf-infra-publish
 
-- lf_pypi_verify_builders: &lf_pypi_verify_builders
+- _lf_pypi_verify_builders: &lf_pypi_verify_builders
     name: lf-pypi-verify-builders
 
     builders:
@@ -1234,7 +1235,7 @@
           parallel: "{parallel}"
       - shell: !include-raw-escape: ../shell/pypi-dist-build.sh
 
-- lf_pypi_publish_builders: &lf_pypi_publish_builders
+- _lf_pypi_publish_builders: &lf_pypi_publish_builders
     name: lf-pypi-publish-builders
 
     builders: