Skip to content

Commit 945ccab

Browse files
Additional options for Temurin jck trigger (#1196)
* test Signed-off-by: Andrew Leonard <[email protected]> * Temurin JckTrigger additional options Signed-off-by: Andrew Leonard <[email protected]> * Temurin JckTrigger additional options Signed-off-by: Andrew Leonard <[email protected]> --------- Signed-off-by: Andrew Leonard <[email protected]>
1 parent dc96a47 commit 945ccab

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

pipelines/build/common/openjdk_build_pipeline.groovy

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,17 @@ class Build {
631631
parallel = 'Dynamic'
632632
num_machines = '2'
633633
}
634+
635+
def extra_options = ""
636+
if ("${platform}" == 's390x_linux' && targetTests.contains('extended.jck')) {
637+
extra_options += " -Xss4m"
638+
}
639+
640+
def extra_app_options = ""
641+
if ("${platform}" == 'ppc64_aix' && targetTests.contains('special.jck')) {
642+
extra_app_options += " customJvmOpts=-Djava.net.preferIPv4Stack=true"
643+
}
644+
634645
context.catchError {
635646
remoteTriggeredBuilds["${targetTests}"] = context.triggerRemoteJob abortTriggeredJob: true,
636647
blockBuildUntilComplete: false,
@@ -644,12 +655,13 @@ class Build {
644655
context.MapParameter(name: 'NUM_MACHINES', value: "${num_machines}"),
645656
context.MapParameter(name: 'PLATFORMS', value: "${platform}"),
646657
context.MapParameter(name: 'PIPELINE_DISPLAY_NAME', value: "${displayName}"),
647-
context.MapParameter(name: 'APPLICATION_OPTIONS', value: "${appOptions}"),
658+
context.MapParameter(name: 'APPLICATION_OPTIONS', value: "${appOptions} ${extra_app_options}"),
648659
context.MapParameter(name: 'LABEL_ADDITION', value: additionalTestLabel),
649660
context.MapParameter(name: 'cause', value: "Remote triggered by job ${env.BUILD_URL}"), // Label is lowercase on purpose to map to the Jenkins target reporting system
650661
context.MapParameter(name: 'AUTO_AQA_GEN', value: "${aqaAutoGen}"),
651662
context.MapParameter(name: 'RERUN_ITERATIONS', value: "1"),
652663
context.MapParameter(name: 'RERUN_FAILURE', value: "true"),
664+
context.MapParameter(name: 'EXTRA_OPTIONS', value: "${extra_options}"),
653665
context.MapParameter(name: 'SETUP_JCK_RUN', value: "${setupJCKRun}")]),
654666
remoteJenkinsName: 'temurin-compliance',
655667
shouldNotFailBuild: true,

0 commit comments

Comments
 (0)