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

Call mixedref testing for all OpenJ9 builds #22

Closed
wants to merge 1 commit into from
Closed

Call mixedref testing for all OpenJ9 builds #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 21 additions & 10 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,21 +265,32 @@ class Build {

def JobHelper = context.library(identifier: 'openjdk-jenkins-helper@master').JobHelper

def testParameters = [
context.string(name: 'UPSTREAM_JOB_NUMBER', value: "${env.BUILD_NUMBER}"),
context.string(name: 'UPSTREAM_JOB_NAME', value: "${env.JOB_NAME}"),
context.string(name: 'RELEASE_TAG', value: "${buildConfig.SCM_REF}"),
context.string(name: 'JDK_REPO', value: jdkRepo),
context.string(name: 'JDK_BRANCH', value: jdkBranch),
context.string(name: 'OPENJ9_BRANCH', value: openj9Branch),
context.string(name: 'LABEL_ADDITION', value: additionalTestLabel),
context.string(name: 'KEEP_REPORTDIR', value: "${keep_test_reportdir}"),
context.string(name: 'ACTIVE_NODE_TIMEOUT', value: "${buildConfig.ACTIVE_NODE_TIMEOUT}")]
if (buildConfig.VARIANT == "openj9" && !buildConfig.ARCHITECTURE.contains('32')) {
// PLATFORM only needs to be passed until all openj9 test platforms are mixed by default
// Exclude 32bit (jdk8 win) as 32bit builds are not mixed
def arch = buildConfig.ARCHITECTURE
if (arch == "x64") {
arch = "x86-64"
}
def os = buildConfig.TARGET_OS
testParameters.add(context.string(name: 'PLATFORM', value: "${arch}_${os}_mixed"))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per eclipse-openj9/openj9#11951 (comment), _mixed must not be added for 32-bit platforms.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added an exception to the if above for 32. Trying to test it internally but Adopt should test it.

}
// Execute test job
if (JobHelper.jobIsRunnable(jobName as String)) {
context.catchError {
context.build job: jobName,
propagate: false,
parameters: [
context.string(name: 'UPSTREAM_JOB_NUMBER', value: "${env.BUILD_NUMBER}"),
context.string(name: 'UPSTREAM_JOB_NAME', value: "${env.JOB_NAME}"),
context.string(name: 'RELEASE_TAG', value: "${buildConfig.SCM_REF}"),
context.string(name: 'JDK_REPO', value: jdkRepo),
context.string(name: 'JDK_BRANCH', value: jdkBranch),
context.string(name: 'OPENJ9_BRANCH', value: openj9Branch),
context.string(name: 'LABEL_ADDITION', value: additionalTestLabel),
context.string(name: 'KEEP_REPORTDIR', value: "${keep_test_reportdir}"),
context.string(name: 'ACTIVE_NODE_TIMEOUT', value: "${buildConfig.ACTIVE_NODE_TIMEOUT}")]
parameters: testParameters
}
} else {
context.println "[WARNING] Requested test job that does not exist or is disabled: ${jobName}"
Expand Down