X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-c-cpp-jobs.yaml;h=d59d073eb1220367f95d55c7029f028a0e314bc0;hb=f216bdeee46b3c3299868bc6fdd2753785358f0a;hp=d1ba86f0c92f60ce2e0251e73a2e12ee8fdd73b2;hpb=455c02c6e706a43fc57e816e69fe347dccae8648;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-c-cpp-jobs.yaml b/jjb/lf-c-cpp-jobs.yaml
index d1ba86f0..d59d073e 100644
--- a/jjb/lf-c-cpp-jobs.yaml
+++ b/jjb/lf-c-cpp-jobs.yaml
@@ -3,7 +3,7 @@
 # AUTOTOOLS COMMON #
 ####################
 
-- lf_autotools_common: &lf_autotools_common
+- _lf_autotools_common: &lf_autotools_common
     name: lf-autotools-common
 
     #####################
@@ -40,7 +40,7 @@
 # AUTOTOOLS PACKAGECLOUD STAGE #
 ################################
 
-- lf_autotools_packagecloud_stage: &lf_autotools_packagecloud_stage
+- _lf_autotools_packagecloud_stage: &lf_autotools_packagecloud_stage
     name: lf-autotools-packagecloud-stage
 
     ######################
@@ -182,7 +182,7 @@
 # AUTOTOOLS SONARQUBE #
 #######################
 
-- lf_autotools_sonarqube: &lf_autotools_sonarqube
+- _lf_autotools_sonarqube: &lf_autotools_sonarqube
     name: lf-autotools-sonarqube
 
     ######################
@@ -213,6 +213,7 @@
     sonar-project-file: sonar-project.properties
     sonar-properties: ""
     sonar-task: ""
+    sonar-jdk: openjdk17
 
     parameters:
       - lf-infra-parameters:
@@ -237,6 +238,7 @@
           sonar-properties: "{sonar-properties}"
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
+          sonar-jdk: "{sonar-jdk}"
 
 - job-template:
     name: "{project-name}-autotools-sonarqube"
@@ -304,7 +306,7 @@
 # AUTOTOOLS VERIFY #
 ####################
 
-- lf_autotools_verify: &lf_autotools_verify
+- _lf_autotools_verify: &lf_autotools_verify
     name: lf-autotools-verify
 
     ######################
@@ -432,7 +434,7 @@
 # CMAKE COMMON #
 ################
 
-- lf_cmake_common: &lf_cmake_common
+- _lf_cmake_common: &lf_cmake_common
     name: lf-cmake-common
 
     #####################
@@ -470,7 +472,7 @@
 # CMAKE SONAR #
 ###############
 
-- lf_cmake_sonar: &lf_cmake_sonar
+- _lf_cmake_sonar: &lf_cmake_sonar
     name: lf-cmake-sonar
 
     ######################
@@ -490,7 +492,7 @@
     make-opts: ""
     pre-build: ""
     sonar-scanner-version: 3.3.0.1492
-    sonarcloud-api-token: ""
+    sonarcloud-api-token-cred-id: sonarcloud-api-token
     sonarcloud-organization: ""
     sonarcloud-project-key: ""
     stream: master
@@ -508,10 +510,15 @@
             SONAR_SCANNER_VERSION={sonar-scanner-version}
             PROJECT_KEY={sonarcloud-project-key}
             PROJECT_ORGANIZATION={sonarcloud-organization}
-            API_TOKEN={sonarcloud-api-token}
       - shell: !include-raw-escape: ../shell/cmake-sonar.sh
       - lf-provide-maven-settings-cleanup
 
+    wrappers:
+      - credentials-binding:
+          - text:
+              credential-id: "{sonarcloud-api-token-cred-id}"
+              variable: API_TOKEN
+
 - job-template:
     name: "{project-name}-cmake-sonar"
     id: gerrit-cmake-sonar
@@ -575,7 +582,7 @@
 # CMAKE SONARQUBE #
 ###################
 
-- lf_cmake_sonarqube: &lf_cmake_sonarqube
+- _lf_cmake_sonarqube: &lf_cmake_sonarqube
     name: lf-cmake-sonarqube
 
     ######################
@@ -608,6 +615,7 @@
     sonar-project-file: "sonar-project.properties"
     sonar-properties: ""
     sonar-task: ""
+    sonar-jdk: openjdk17
 
     parameters:
       - lf-infra-parameters:
@@ -638,6 +646,7 @@
           sonar-properties: "{sonar-properties}"
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
+          sonar-jdk: "{sonar-jdk}"
 
 - job-template:
     name: "{project-name}-cmake-sonarqube"
@@ -705,7 +714,7 @@
 # CMAKE STAGE #
 ###############
 
-- lf_cmake_stage: &lf_cmake_stage
+- _lf_cmake_stage: &lf_cmake_stage
     name: lf-cmake-stage
 
     ######################
@@ -862,7 +871,7 @@
 # CMAKE PACKAGECLOUD STAGE #
 ############################
 
-- lf_cmake_pc_stage: &lf_cmake_pc_stage
+- _lf_cmake_pc_stage: &lf_cmake_pc_stage
     name: lf-cmake-packagecloud-stage
 
     ######################
@@ -1004,7 +1013,7 @@
 # CMAKE VERIFY #
 ################
 
-- lf_cmake_verify: &lf_cmake_verify
+- _lf_cmake_verify: &lf_cmake_verify
     name: lf-cmake-verify
 
     ######################