Skip to content

Handle empty JVM_OPTIONS correctly on dynamic/container agents #7351

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

Draft
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −1
Draft

Handle empty JVM_OPTIONS correctly on dynamic/container agents #7351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0750c9f
Initial plan
Copilot Jul 14, 2026
95e46f1
Unset empty JVM_OPTIONS before make in Jenkins pipeline
Copilot Jul 14, 2026
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
9 changes: 8 additions & 1 deletion buildenv/jenkins/JenkinsfileBase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ def makeTest(testParam) {
if (env.DYNAMIC_COMPILE) {
makeTestCmd = "$RESOLVED_MAKE;cd ./aqa-tests; . ./scripts/testenv/testenvSettings.sh;cd ./TKG; \$MAKE $testParam"
}
if (!env.JVM_OPTIONS?.trim()) {
Comment thread
andrew-m-leonard marked this conversation as resolved.
makeTestCmd = "unset JVM_OPTIONS; $makeTestCmd"
}
//unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
if (JDK_IMPL == 'hotspot' && PLATFORM.contains('alpine-linux')) {
makeTestCmd = "unset LD_LIBRARY_PATH; $makeTestCmd"
Expand Down Expand Up @@ -375,11 +378,15 @@ def setupParallelEnv() {
// NUM_LIST can be different than numOfMachines.
def genParallelList(PARALLEL_OPTIONS) {
String unsetLLP = ""
String unsetJvmOptions = ""
if (!env.JVM_OPTIONS?.trim()) {
unsetJvmOptions = "unset JVM_OPTIONS;"
}
//unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
if (JDK_IMPL == 'hotspot' && PLATFORM.contains('alpine-linux')) {
unsetLLP = "unset LD_LIBRARY_PATH;"
}
sh "cd ./aqa-tests/TKG; $RESOLVED_MAKE; ${unsetLLP} \$MAKE genParallelList ${PARALLEL_OPTIONS}"
sh "cd ./aqa-tests/TKG; $RESOLVED_MAKE; ${unsetJvmOptions} ${unsetLLP} \$MAKE genParallelList ${PARALLEL_OPTIONS}"
def parallelList = "aqa-tests/TKG/parallelList.mk"
int NUM_LIST = -1
if (fileExists("${parallelList}")) {
Expand Down