Skip to content

Commit

Permalink
Automerge upstream/master
Browse files Browse the repository at this point in the history
  • Loading branch information
j9build committed Oct 21, 2024
2 parents 1cf9e5b + 000de40 commit 564bc26
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions pipelines/build/common/openjdk_build_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -2693,13 +2693,11 @@ class Build {
platform = 'x86-64_' + buildConfig.TARGET_OS
} else {
platform = buildConfig.ARCHITECTURE + '_' + buildConfig.TARGET_OS
}
if ( !(platform =='aarch64_windows') ) {
if ( !(buildConfig.JAVA_TO_BUILD == 'jdk8u' && platform == 's390x_linux') ) {
context.echo "Remote trigger Eclipse Temurin AQA_Test_Pipeline job with ${platform} ${buildConfig.JAVA_TO_BUILD}"
def remoteTargets = remoteTriggerJckTests(platform, filename)
context.parallel remoteTargets
}
}
if ( !(buildConfig.JAVA_TO_BUILD == 'jdk8u' && platform == 's390x_linux') ) {
context.echo "Remote trigger Eclipse Temurin AQA_Test_Pipeline job with ${platform} ${buildConfig.JAVA_TO_BUILD}"
def remoteTargets = remoteTriggerJckTests(platform, filename)
context.parallel remoteTargets
}
}

Expand Down

0 comments on commit 564bc26

Please sign in to comment.