Skip to content

Commit ddd641e

Browse files
authored
Revert "Update aqa tests to use JDK 17 (#5711)" (#5773)
This reverts commit 47b534f.
1 parent 54c88bb commit ddd641e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

buildenv/jenkins/getDependency

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ def testBuild() {
1717
timeout(time: time_limit, unit: 'HOURS') {
1818
try {
1919
if( params.BUILD_TYPE == "systemtest" ){
20-
sh 'curl -OLJks "https://api.adoptopenjdk.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/adoptopenjdk"'
20+
sh 'curl -OLJks "https://api.adoptopenjdk.net/v3/binary/latest/8/ga/linux/x64/jdk/hotspot/normal/adoptopenjdk"'
2121
sh 'mkdir ${WORKSPACE}/j2sdk-image'
22-
sh 'tar -xzf OpenJDK17U-jdk_x64_linux_hotspot*.gz -C ${WORKSPACE}/j2sdk-image --strip-components 1'
23-
sh '${WORKSPACE}/j2sdk-image/bin/java -version'
22+
sh 'tar -xzf OpenJDK8U-jdk_x64_linux_hotspot*.gz -C ${WORKSPACE}/j2sdk-image --strip-components 1'
23+
sh '${WORKSPACE}/j2sdk-image/jre/bin/java -version'
2424
sh 'git clone https://github.com/adoptium/aqa-systemtest'
2525
sh 'git clone https://github.com/adoptium/STF'
26-
sh 'ant -f ./aqa-systemtest/openjdk.build/build.xml -Djava.home=${WORKSPACE}/j2sdk-image -Dprereqs_root=${WORKSPACE}/systemtest_prereqs configure'
27-
sh 'ant -f ./aqa-systemtest/openjdk.test.mauve/build.xml -Djava.home=${WORKSPACE}/j2sdk-image -Dprereqs_root=${WORKSPACE}/systemtest_prereqs configure'
26+
sh 'ant -f ./aqa-systemtest/openjdk.build/build.xml -Djava.home=${WORKSPACE}/j2sdk-image/jre -Dprereqs_root=${WORKSPACE}/systemtest_prereqs configure'
27+
sh 'ant -f ./aqa-systemtest/openjdk.test.mauve/build.xml -Djava.home=${WORKSPACE}/j2sdk-image/jre -Dprereqs_root=${WORKSPACE}/systemtest_prereqs configure'
2828
archiveArtifacts '**/systemtest_prereqs/cvsclient/org-netbeans-lib-cvsclient.jar'
2929
archiveArtifacts '**/systemtest_prereqs/mauve/mauve.jar'
3030
archiveArtifacts '**/systemtest_prereqs/junit/junit.jar'

0 commit comments

Comments
 (0)