Skip to content

Commit 4779b26

Browse files
authored
Remove JDK8 restriction for alpine library path (#5430)
* Remove JDK8 restriction for alpine library path * remove JDK8 restrictions
1 parent b02fb82 commit 4779b26

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

buildenv/jenkins/JenkinsfileBase

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def makeTest(testParam) {
88
// Note: keyword source cannot be used in Jenkins script. Therefore, using "." instead.
99
String makeTestCmd = "$RESOLVED_MAKE;cd ./aqa-tests; . ./scripts/testenv/testenvSettings.sh;cd ./TKG; \$MAKE $testParam"
1010
//unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
11-
if (JDK_IMPL == 'hotspot' && JDK_VERSION == '8' && PLATFORM.contains('alpine-linux')) {
11+
if (JDK_IMPL == 'hotspot' && PLATFORM.contains('alpine-linux')) {
1212
makeTestCmd = "unset LD_LIBRARY_PATH; $makeTestCmd"
1313
}
1414
try {
@@ -327,7 +327,7 @@ def setupParallelEnv() {
327327
def genParallelList(PARALLEL_OPTIONS) {
328328
String unsetLLP = ""
329329
//unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
330-
if (JDK_IMPL == 'hotspot' && JDK_VERSION == '8' && PLATFORM.contains('alpine-linux')) {
330+
if (JDK_IMPL == 'hotspot' && PLATFORM.contains('alpine-linux')) {
331331
unsetLLP = "unset LD_LIBRARY_PATH;"
332332
}
333333
sh "cd ./aqa-tests/TKG; ${unsetLLP} make genParallelList ${PARALLEL_OPTIONS}"
@@ -620,7 +620,7 @@ def get_sources() {
620620
def makeCompileTest(){
621621
String makeTestCmd = "bash ./compile.sh"
622622
//unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
623-
if (JDK_IMPL == 'hotspot' && JDK_VERSION == '8' && PLATFORM.contains('alpine-linux')) {
623+
if (JDK_IMPL == 'hotspot' && PLATFORM.contains('alpine-linux')) {
624624
makeTestCmd = "unset LD_LIBRARY_PATH; $makeTestCmd"
625625
}
626626
dir('aqa-tests') {

0 commit comments

Comments
 (0)