X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-python-jobs.yaml;h=85d95f95f8f4eab83d069f5e7793b65c21715e89;hb=5e7040b0710c05df16d1815be74214c5eb5f9239;hp=bb123f4718261b6bebdfc4b6ba678a10f4a902b8;hpb=f02f2f445600af0b0b116bee97bf5d76629ad4b4;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index bb123f47..85d95f95 100644
--- 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
 
     ######################
@@ -391,9 +391,8 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
-    # SonarCloud scan using jdk8 will become deprecated by Oct, 2020
-    # Projects not compatible with jdk11 can set java-version to something else
-    java-version: openjdk11
+    # Projects not compatible with jdk13 can set java-version to something else
+    java-version: openjdk13
     parallel: true
     pre-build-script: "# pre-build script goes here"
     python-version: python3
@@ -543,7 +542,7 @@
 # Python Sonar with Tox #
 #########################
 
-- lf_tox_sonar: &lf_tox_sonar
+- _lf_tox_sonar: &lf_tox_sonar
     name: lf-tox-sonar
 
     ######################
@@ -557,12 +556,12 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
-    java-version: openjdk11
+    java-version: openjdk13
     mvn-global-settings: global-settings
     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 +572,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 jdk13 can set java-version to something else
+    sonarcloud-java-version: openjdk13
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -764,7 +762,7 @@
 # Tox SonarQube #
 #################
 
-- lf_tox_sonarqube: &lf_tox_sonarqube
+- _lf_tox_sonarqube: &lf_tox_sonarqube
     name: lf-tox-sonarqube
 
     ######################
@@ -911,7 +909,7 @@
 # Tox Common #
 ##############
 
-- lf_tox_common: &lf_tox_common
+- _lf_tox_common: &lf_tox_common
     name: lf-tox-common
 
     ######################
@@ -1151,7 +1149,7 @@
 # PyPI #
 ########
 
-- lf_pypi_common: &lf_pypi_common
+- _lf_pypi_common: &lf_pypi_common
     name: lf-pypi-common
 
     ######################
@@ -1222,7 +1220,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 +1232,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: