Skip to content

Commit

Permalink
Inherit JDK16 testing platforms for JDK17 (#2429)
Browse files Browse the repository at this point in the history 
Signed-off-by: Morgan Davies <morgandavies2020@gmail.com>
  • Loading branch information
@M-Davies
M-Davies authored Feb 3, 2021
1 parent bdc184e commit ecb4ce1
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 57 deletions.
28 changes: 14 additions & 14 deletions pipelines/build/common/build_base_file.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ class Builder implements Serializable {
def context
def currentBuild

/*
Test targets triggered in 'nightly' build pipelines running 6 days per week
nightly + weekly to be run during a 'release' pipeline
/*
Test targets triggered in 'nightly' build pipelines running 6 days per week
nightly + weekly to be run during a 'release' pipeline
*/
final List<String> nightly = [
'sanity.openjdk',
Expand All @@ -75,9 +75,9 @@ class Builder implements Serializable {
'sanity.functional',
'extended.functional'
]
/*
Test targets triggered in 'weekly' build pipelines running once per week
nightly + weekly to be run during a 'release' pipeline
/*
Test targets triggered in 'weekly' build pipelines running once per week
nightly + weekly to be run during a 'release' pipeline
*/
final List<String> weekly = [
'extended.openjdk',
Expand Down Expand Up @@ -169,7 +169,7 @@ class Builder implements Serializable {
}

/*
Returns true if possibleMap is a Map. False otherwise.
Returns true if possibleMap is a Map. False otherwise.
*/
static def isMap(possibleMap) {
return Map.class.isInstance(possibleMap)
Expand All @@ -194,14 +194,14 @@ class Builder implements Serializable {

return ""
}

/*
Get the list of tests to run from the build configurations.
We run different test categories depending on if this build is a release or nightly. This function parses and applies this to the individual build config.
*/
List<String> getTestList(Map<String, ?> configuration) {
List<String> testList = []
/*
/*
* No test key or key value is test: false --- test disabled
* Key value is test: 'default' --- nightly build trigger 'nightly' test set, weekly build trigger or release build trigger 'nightly' + 'weekly' test sets
* Key value is test: [customized map] specified nightly and weekly test lists
Expand All @@ -221,7 +221,7 @@ class Builder implements Serializable {
}

} else {

// Default to the test sets declared if one isn't set in the build configuration
if ( testJobType == "nightly" ) {
testList = nightly
Expand Down Expand Up @@ -255,7 +255,7 @@ class Builder implements Serializable {
def dockerOverride(Map<String, ?> configuration, String variant) {
Boolean overrideDocker = false
if (dockerExcludes == {}) {
return overrideDocker
return overrideDocker
}

String stringArch = configuration.arch as String
Expand Down Expand Up @@ -532,7 +532,7 @@ class Builder implements Serializable {
return true
}

/*
/*
Call job to push artifacts to github. Usually it's only executed on a nightly build
*/
def publishBinary() {
Expand Down Expand Up @@ -611,7 +611,7 @@ class Builder implements Serializable {
// Execute build job for configuration i.e jdk11u/job/jdk11u-linux-x64-hotspot
context.stage(configuration.key) {
context.echo "Created job " + downstreamJobName

// execute build
def downstreamJob = context.build job: downstreamJobName, propagate: false, parameters: config.toBuildParams()

Expand All @@ -629,7 +629,7 @@ class Builder implements Serializable {
} catch (FlowInterruptedException e) {
context.println "[ERROR] Previous artifact removal timeout (${pipelineTimeouts.REMOVE_ARTIFACTS_TIMEOUT} HOURS) for ${downstreamJobName} has been reached. Exiting..."
throw new Exception()
}
}

try {
context.timeout(time: pipelineTimeouts.COPY_ARTIFACTS_TIMEOUT, unit: "HOURS") {
Expand Down
62 changes: 19 additions & 43 deletions pipelines/jobs/configurations/jdk17_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ class Config17 {
os : 'mac',
arch : 'x64',
additionalNodeLabels: 'macos10.14',
test : [
nightly: [],
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
],
test : 'default',
configureArgs : '--enable-dtrace'
],

x64MacXL : [
os : 'mac',
arch : 'x64',
Expand All @@ -28,21 +25,18 @@ class Config17 {
openj9 : 'adoptopenjdk/centos7_build_image'
],
dockerFile: [
openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile'
],
test : [
nightly: [],
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.external', 'special.functional']
openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile'
],
test : 'default',
additionalTestLabels: [
openj9 : '!(centos6||rhel6)'
],
configureArgs : [
"openj9" : '--enable-dtrace --enable-jitserver',
"hotspot" : '--enable-dtrace'
"openj9" : '--enable-dtrace --enable-jitserver',
"hotspot" : '--enable-dtrace'
]
],

x64LinuxXL : [
os : 'linux',
arch : 'x64',
Expand Down Expand Up @@ -74,12 +68,9 @@ class Config17 {
os : 'windows',
arch : 'x64',
additionalNodeLabels: 'win2012&&vs2017',
test : [
nightly: [],
weekly : ['sanity.openjdk', 'sanity.perf', 'sanity.system', 'extended.system']
]
test : 'default'
],

x64WindowsXL: [
os : 'windows',
arch : 'x64',
Expand All @@ -106,10 +97,10 @@ class Config17 {
os : 'windows',
arch : 'x86-32',
additionalNodeLabels: 'win2012&&vs2017',
buildArgs : [
buildArgs : [
hotspot : '--jvm-variant client,server'
],
test : ['sanity.openjdk']
test : 'default'
],

ppc64Aix : [
Expand All @@ -119,24 +110,18 @@ class Config17 {
hotspot: 'xlc16&&aix710',
openj9: 'xlc16&&aix715'
],
test : [
nightly: [],
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system']
],
test : 'default',
cleanWorkspaceAfterBuild: true
],


s390xLinux : [
os : 'linux',
arch : 's390x',
test : [
nightly: [],
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
],
test : 'default',
configureArgs : '--enable-dtrace'
],

s390xLinuxXL : [
os : 'linux',
arch : 's390x',
Expand All @@ -149,17 +134,14 @@ class Config17 {
os : 'linux',
arch : 'ppc64le',
additionalNodeLabels: 'centos7',
test : [
nightly: [],
weekly: ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
],
test : 'default',
configureArgs : [
"hotspot" : '--enable-dtrace',
"openj9" : '--enable-dtrace --enable-jitserver'
]

],

ppc64leLinuxXL : [
os : 'linux',
arch : 'ppc64le',
Expand All @@ -173,13 +155,10 @@ class Config17 {
os : 'linux',
arch : 'aarch64',
dockerImage : 'adoptopenjdk/centos7_build_image',
test : [
nightly: [],
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
],
test : 'default',
configureArgs : '--enable-dtrace'
],

aarch64LinuxXL : [
os : 'linux',
dockerImage : 'adoptopenjdk/centos7_build_image',
Expand All @@ -192,10 +171,7 @@ class Config17 {
arm32Linux : [
os : 'linux',
arch : 'arm',
test : [
nightly: ['sanity.openjdk'],
weekly : []
],
test : 'default',
configureArgs : '--enable-dtrace'
]
]
Expand Down

0 comments on commit ecb4ce1

Please sign in to comment.