File tree Expand file tree Collapse file tree 2 files changed +8
-2
lines changed
it/src/test/java/com/sonarsource/scanner/it Expand file tree Collapse file tree 2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -92,7 +92,7 @@ mend_scan_task:
92
92
ws_artifacts :
93
93
path : " whitesource/**/*"
94
94
95
- linux_x64_qa_java17_task :
95
+ linux_x64_qa_java11_task :
96
96
depends_on :
97
97
- build
98
98
<< : *ONLY_SONARSOURCE_QA
@@ -113,6 +113,9 @@ linux_x64_qa_java17_task:
113
113
- export PATH=$PATH:/tmp/${nodeName}/bin
114
114
- source cirrus-env QA
115
115
- 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
116
119
- cd it
117
120
- mvn -B -e -Dsonar.runtimeVersion="$SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify
118
121
cleanup_before_cache_script :
@@ -142,7 +145,7 @@ win_x64_qa_java17_task:
142
145
143
146
promote_task :
144
147
depends_on :
145
- - linux_x64_qa_java17
148
+ - linux_x64_qa_java11
146
149
- win_x64_qa_java17
147
150
<< : *ONLY_SONARSOURCE_QA_EXCEPT_ON_NIGHTLY_CRON
148
151
eks_container :
Original file line number Diff line number Diff line change @@ -103,6 +103,9 @@ public void resetData() {
103
103
104
104
SonarScanner newScannerWithToken (File baseDir , String token , String ... keyValueProperties ) {
105
105
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
+ }
106
109
scannerCli .setScannerVersion (artifactVersion ().toString ());
107
110
if (orchestrator .getServer ().version ().isGreaterThanOrEquals (10 , 0 )) {
108
111
scannerCli .setProperty ("sonar.token" , token );
You can’t perform that action at this time.
0 commit comments