Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove JDK8 restriction for alpine library path #5430

Merged
merged 2 commits into from
Jul 12, 2024
Merged

Remove JDK8 restriction for alpine library path #5430

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fc4180
Remove JDK8 restriction for alpine library path
Haroon-Khel Jul 11, 2024
c3a1d7c
remove JDK8 restrictions
Haroon-Khel Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions buildenv/jenkins/JenkinsfileBase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def makeTest(testParam) {
// Note: keyword source cannot be used in Jenkins script. Therefore, using "." instead.
String makeTestCmd = "$RESOLVED_MAKE;cd ./aqa-tests; . ./scripts/testenv/testenvSettings.sh;cd ./TKG; \$MAKE $testParam"
//unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
if (JDK_IMPL == 'hotspot' && JDK_VERSION == '8' && PLATFORM.contains('alpine-linux')) {
if (JDK_IMPL == 'hotspot' && PLATFORM.contains('alpine-linux')) {
makeTestCmd = "unset LD_LIBRARY_PATH; $makeTestCmd"
}
try {
Expand Down Expand Up @@ -327,7 +327,7 @@ def setupParallelEnv() {
def genParallelList(PARALLEL_OPTIONS) {
String unsetLLP = ""
//unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
if (JDK_IMPL == 'hotspot' && JDK_VERSION == '8' && PLATFORM.contains('alpine-linux')) {
if (JDK_IMPL == 'hotspot' && PLATFORM.contains('alpine-linux')) {
unsetLLP = "unset LD_LIBRARY_PATH;"
}
sh "cd ./aqa-tests/TKG; ${unsetLLP} make genParallelList ${PARALLEL_OPTIONS}"
Expand Down Expand Up @@ -620,7 +620,7 @@ def get_sources() {
def makeCompileTest(){
String makeTestCmd = "bash ./compile.sh"
//unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
if (JDK_IMPL == 'hotspot' && JDK_VERSION == '8' && PLATFORM.contains('alpine-linux')) {
if (JDK_IMPL == 'hotspot' && PLATFORM.contains('alpine-linux')) {
makeTestCmd = "unset LD_LIBRARY_PATH; $makeTestCmd"
}
dir('aqa-tests') {
Expand Down