Skip to content

Commit 47fcd50

Browse files
committed
Run some scanner command in ITs with Java 11
1 parent 5b66816 commit 47fcd50

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.cirrus.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ mend_scan_task:
9292
ws_artifacts:
9393
path: "whitesource/**/*"
9494

95-
linux_x64_qa_java17_task:
95+
linux_x64_qa_java11_task:
9696
depends_on:
9797
- build
9898
<<: *ONLY_SONARSOURCE_QA
@@ -113,6 +113,9 @@ linux_x64_qa_java17_task:
113113
- export PATH=$PATH:/tmp/${nodeName}/bin
114114
- source cirrus-env QA
115115
- source set_maven_build_version $BUILD_NUMBER
116+
- 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
117+
- tar xzf OpenJDK11U-jre_x64_linux_hotspot_11.0.27_6.tar.gz -C /tmp
118+
- export JAVA_11_HOME=/tmp/jdk-11.0.27+6-jre
116119
- cd it
117120
- mvn -B -e -Dsonar.runtimeVersion="$SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify
118121
cleanup_before_cache_script:
@@ -142,7 +145,7 @@ win_x64_qa_java17_task:
142145

143146
promote_task:
144147
depends_on:
145-
- linux_x64_qa_java17
148+
- linux_x64_qa_java11
146149
- win_x64_qa_java17
147150
<<: *ONLY_SONARSOURCE_QA_EXCEPT_ON_NIGHTLY_CRON
148151
eks_container:

it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ public void resetData() {
103103

104104
SonarScanner newScannerWithToken(File baseDir, String token, String... keyValueProperties) {
105105
SonarScanner scannerCli = SonarScanner.create(baseDir, keyValueProperties);
106+
if (System.getenv().containsKey("JAVA_11_HOME")) {
107+
scannerCli.getEnvironmentVariables().put("JAVA_HOME", System.getenv("JAVA_11_HOME"));
108+
}
106109
scannerCli.setScannerVersion(artifactVersion().toString());
107110
if (orchestrator.getServer().version().isGreaterThanOrEquals(10, 0)) {
108111
scannerCli.setProperty("sonar.token", token);

0 commit comments

Comments
 (0)