diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2025-07-07 17:26:18 +0200 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2025-07-07 17:59:24 +0200 |
| commit | b01478c51e8523dfe05a1d9ea216e9ff99b5b517 (patch) | |
| tree | 7887d268ee36fc1b5a138ce7886884248ddc5bce | |
| parent | 5b668168ee6f1b6943a196b7702657cb3e944b39 (diff) | |
| download | sonar-scanner-cli-jh/SCANCLI-180_java_11.tar.gz sonar-scanner-cli-jh/SCANCLI-180_java_11.zip | |
Run scanner commands in ITs with Java 11jh/SCANCLI-180_java_11
When env variable JAVA_11_HOME is defined
| -rw-r--r-- | .cirrus.yml | 7 | ||||
| -rw-r--r-- | it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index a489c04..69418f2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -92,7 +92,7 @@ mend_scan_task: ws_artifacts: path: "whitesource/**/*" -linux_x64_qa_java17_task: +linux_x64_qa_java11_task: depends_on: - build <<: *ONLY_SONARSOURCE_QA @@ -113,6 +113,9 @@ linux_x64_qa_java17_task: - export PATH=$PATH:/tmp/${nodeName}/bin - source cirrus-env QA - source set_maven_build_version $BUILD_NUMBER + - wget -O OpenJDK11U-jre_x64_linux_hotspot_11.0.27_6.tar.gz https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.27%2B6/OpenJDK11U-jre_x64_linux_hotspot_11.0.27_6.tar.gz + - tar xzf OpenJDK11U-jre_x64_linux_hotspot_11.0.27_6.tar.gz -C /tmp + - export JAVA_11_HOME=/tmp/jdk-11.0.27+6-jre - cd it - mvn -B -e -Dsonar.runtimeVersion="$SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify cleanup_before_cache_script: @@ -142,7 +145,7 @@ win_x64_qa_java17_task: promote_task: depends_on: - - linux_x64_qa_java17 + - linux_x64_qa_java11 - win_x64_qa_java17 <<: *ONLY_SONARSOURCE_QA_EXCEPT_ON_NIGHTLY_CRON eks_container: diff --git a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java index 6b12552..4601cad 100644 --- a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java +++ b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java @@ -103,6 +103,9 @@ public abstract class ScannerTestCase { SonarScanner newScannerWithToken(File baseDir, String token, String... keyValueProperties) { SonarScanner scannerCli = SonarScanner.create(baseDir, keyValueProperties); + if (System.getenv().containsKey("JAVA_11_HOME")) { + scannerCli.getEnvironmentVariables().put("JAVA_HOME", System.getenv("JAVA_11_HOME")); + } scannerCli.setScannerVersion(artifactVersion().toString()); if (orchestrator.getServer().version().isGreaterThanOrEquals(10, 0)) { scannerCli.setProperty("sonar.token", token); @@ -115,6 +118,9 @@ public abstract class ScannerTestCase { SonarScanner newScannerWithAdminCredentials(File baseDir, String... keyValueProperties) { SonarScanner scannerCli = SonarScanner.create(baseDir, keyValueProperties); + if (System.getenv().containsKey("JAVA_11_HOME")) { + scannerCli.getEnvironmentVariables().put("JAVA_HOME", System.getenv("JAVA_11_HOME")); + } scannerCli.setScannerVersion(artifactVersion().toString()); if (orchestrator.getServer().version().isGreaterThanOrEquals(25, 1)) { scannerCli.setProperty("sonar.token", orchestrator.getDefaultAdminToken()); |