Skip to content

Commit

Permalink
trigger with standard set
Browse files Browse the repository at this point in the history 
Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
  • Loading branch information
@sophia-guo
Sophia Guo authored and sophia-guo committed Aug 24, 2020
1 parent a62feca commit f87778c
Show file tree
Hide file tree
Showing 11 changed files with 285 additions and 134 deletions.
36 changes: 30 additions & 6 deletions pipelines/build/common/build_base_file.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ class Builder implements Serializable {
def context
def currentBuild


final List<String> nightly = ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.external']
final List<String> weekly = [
'extended.openjdk', 'extended.perf', 'extended.external',
'special.openjdk','special.functional', 'special.system', 'special.perf'
]

IndividualBuildConfig buildConfiguration(Map<String, ?> platformConfig, String variant) {

def additionalNodeLabels = formAdditionalBuildNodeLabels(platformConfig, variant)
Expand Down Expand Up @@ -122,17 +127,36 @@ class Builder implements Serializable {

return ""
}


/*
* Get the list of tests from jdk*_pipeline_config.groovy.
* @param configuration
*/
List<String> getTestList(Map<String, ?> configuration) {
if (configuration.containsKey("test")) {
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, release build trigger 'nightly' + 'weekly' test sets
* Key value is test: [customized map] specified nightly and weekly test lists
*/
if (configuration.containsKey("test") && configuration.get("test")) {
def testJobType = release ? "release" : "nightly"
if (isMap(configuration.test)) {
return (configuration.test as Map).get(testJobType) as List<String>
if ( testJobType == "nightly" ) {
testList = (configuration.test as Map).get("nightly") as List<String>
} else {
testList = ((configuration.test as Map).get("nightly") as List<String>) + ((configuration.test as Map).get("weekly") as List<String>)
}
} else {
return configuration.test as List<String>
if ( testJobType == "nightly" ) {
testList = nightly
} else {
testList = nightly + weekly
}
}
}
return []
testList.unique()
return testList
}

def dockerOverride(Map<String, ?> configuration, String variant) {
Expand Down
12 changes: 7 additions & 5 deletions pipelines/build/common/config_regeneration.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class Regeneration implements Serializable {

private final def jenkinsBuildRoot
private String javaToBuild
private final List<String> defaultTestList = ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.external']

public Regeneration(
String javaVersion,
Expand Down Expand Up @@ -163,14 +164,15 @@ class Regeneration implements Serializable {
* @param configuration
*/
List<String> getTestList(Map<String, ?> configuration) {
if (configuration.containsKey("test")) {
List<String> testList = []
if (configuration.containsKey("test") && configuration.get("test")) {
if (isMap(configuration.test)) {
return (configuration.test as Map).get("nightly") as List<String> // no need to check for release
} else {
return configuration.test as List<String>
testList = (configuration.test as Map).get("nightly") as List<String> // no need to check for release
}
testList = defaultTestList
}
return []
testList.unique()
return testList
}

/*
Expand Down
35 changes: 28 additions & 7 deletions pipelines/jobs/configurations/jdk10u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@ class Config10 {
os : 'mac',
arch : 'x64',
additionalNodeLabels: 'build-macstadium-macos1010-1',
test : ['sanity.openjdk', 'sanity.system'],
test : [
nightly: ['sanity.openjdk', 'sanity.system'],
weekly : []
],
configureArgs : '--enable-dtrace=auto'
],
x64Linux : [
os : 'linux',
arch : 'x64',
additionalNodeLabels: 'centos6',
test : ['sanity.openjdk', 'sanity.system', 'sanity.external'],
test : [
nightly: ['sanity.openjdk', 'sanity.system', 'sanity.external'],
weekly : []
],
configureArgs : '--enable-dtrace=auto'
],

Expand All @@ -23,7 +29,10 @@ class Config10 {
hotspot: 'win2012',
openj9: 'win2012&&mingw-cygwin'
],
test : ['sanity.openjdk']
test : [
nightly: ['sanity.openjdk'],
weekly : []
]
],

ppc64Aix : [
Expand All @@ -38,7 +47,10 @@ class Config10 {
additionalNodeLabels: [
hotspot: 'rhel7'
],
test : ['sanity.openjdk', 'sanity.system'],
test : [
nightly: ['sanity.openjdk', 'sanity.system'],
weekly : []
],
configureArgs : '--enable-dtrace=auto'
],

Expand All @@ -52,22 +64,31 @@ class Config10 {
ppc64leLinux : [
os : 'linux',
arch : 'ppc64le',
test : ['sanity.openjdk', 'sanity.system'],
test : [
nightly: ['sanity.openjdk', 'sanity.system'],
weekly : []
],
configureArgs : '--enable-dtrace=auto'
],

arm32Linux : [
os : 'linux',
arch : 'arm',
test : ['sanity.openjdk'],
test : [
nightly: ['sanity.openjdk'],
weekly : []
],
configureArgs : '--enable-dtrace=auto'
],

aarch64Linux : [
os : 'linux',
arch : 'aarch64',
additionalNodeLabels: 'centos7',
test : ['sanity.openjdk'],
test : [
nightly: ['sanity.openjdk'],
weekly : []
],
configureArgs : '--enable-dtrace=auto'
],

Expand Down
34 changes: 14 additions & 20 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Config11 {
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'macos10.14',
test : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf'],
test : 'default',
configureArgs : [
"openj9" : '--enable-dtrace=auto --with-cmake',
"hotspot" : '--enable-dtrace=auto'
Expand All @@ -15,7 +15,7 @@ class Config11 {
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'macos10.14',
test : ['sanity.openjdk', 'sanity.system', 'extended.system'],
test : 'default',
additionalFileNameTag: "macosXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace=auto --with-cmake'
],
Expand All @@ -27,10 +27,7 @@ class Config11 {
dockerFile: [
openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile'
],
test : [
nightly: ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.external'],
release: ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.external', 'special.functional']
],
test : 'default',
configureArgs : [
"openj9" : '--enable-jitserver --enable-dtrace=auto',
"hotspot" : '--enable-dtrace=auto',
Expand All @@ -50,14 +47,14 @@ class Config11 {
buildArgs : [
hotspot : '--jvm-variant client,server'
],
test : ['sanity.openjdk', 'sanity.perf', 'sanity.system', 'extended.system']
test : 'default'
],

x64WindowsXL : [
os : 'windows',
arch : 'x64',
additionalNodeLabels : 'win2012&&vs2017',
test : ['sanity.openjdk', 'sanity.system'],
test : 'default',
additionalFileNameTag: "windowsXL",
configureArgs : '--with-noncompressedrefs'
],
Expand All @@ -72,7 +69,7 @@ class Config11 {
buildArgs : [
hotspot : '--jvm-variant client,server'
],
test : ['sanity.openjdk']
test : 'default'
],

ppc64Aix : [
Expand All @@ -82,16 +79,13 @@ class Config11 {
hotspot: 'xlc13&&aix710',
openj9: 'xlc13&&aix715'
],
test : [
nightly: ['sanity.openjdk'],
release: ['sanity.openjdk', 'sanity.system', 'extended.system']
]
test : 'default'
],

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

Expand All @@ -105,7 +99,7 @@ class Config11 {
ppc64leLinux : [
os : 'linux',
arch : 'ppc64le',
test : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf'],
test : 'default',
configureArgs : [
"hotspot" : '--enable-dtrace=auto',
"openj9" : '--enable-dtrace=auto --enable-jitserver'
Expand All @@ -126,7 +120,7 @@ class Config11 {
os : 'linux',
arch : 'aarch64',
dockerImage : 'adoptopenjdk/centos7_build_image',
test : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf'],
test : 'default',
configureArgs : '--enable-dtrace=auto'
],

Expand All @@ -145,29 +139,29 @@ class Config11 {
openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile'
],
arch : 'x64',
test : ['sanity.openjdk', 'sanity.system', 'extended.system'],
test : "default",
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-jitserver --enable-dtrace=auto'
],
s390xLinuxXL : [
os : 'linux',
arch : 's390x',
test : ['sanity.openjdk', 'sanity.system', 'extended.system'],
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace=auto'
],
ppc64leLinuxXL : [
os : 'linux',
arch : 'ppc64le',
test : ['sanity.openjdk', 'sanity.system', 'extended.system'],
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace=auto --enable-jitserver'
],
aarch64LinuxXL : [
os : 'linux',
dockerImage : 'adoptopenjdk/centos7_build_image',
arch : 'aarch64',
test : ['sanity.openjdk', 'sanity.system', 'extended.system'],
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace=auto'
],
Expand Down
Loading

0 comments on commit f87778c

Please sign in to comment.