Skip to content

Commit

Permalink
Openj9 XL spec cleanup (#163)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sophia-guo
sophia-guo authored Jun 9, 2021
1 parent b9b8f47 commit 5247c3a
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 232 deletions.
4 changes: 0 additions & 4 deletions pipelines/build/common/build_base_file.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,6 @@ class Builder implements Serializable {
String stringOs = configuration.os as String
String estimatedKey = stringArch + stringOs.capitalize()

if (configuration.containsKey("additionalFileNameTag")) {
estimatedKey = estimatedKey + "XL"
}

if (dockerExcludes.containsKey(estimatedKey)) {

if (dockerExcludes[estimatedKey].contains(variant)) {
Expand Down
4 changes: 0 additions & 4 deletions pipelines/build/common/config_regeneration.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,6 @@ class Regeneration implements Serializable {
String stringOs = configuration.os as String
String estimatedKey = stringArch + stringOs.capitalize()

if (configuration.containsKey("additionalFileNameTag")) {
estimatedKey = estimatedKey + "XL"
}

if (excludedBuilds.containsKey(estimatedKey)) {

if (excludedBuilds[estimatedKey].contains(variant)) {
Expand Down
14 changes: 0 additions & 14 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,6 @@ class Build {
default: variant = "hs"
}
def jobName = "Test_openjdk${jobParams['JDK_VERSIONS']}_${variant}_${testType}_${jobParams['ARCH_OS_LIST']}"
if (buildConfig.ADDITIONAL_FILE_NAME_TAG) {
switch (buildConfig.ADDITIONAL_FILE_NAME_TAG) {
case ~/.*XL.*/:
jobName += "_xl";
break
}
}
jobParams.put('TEST_JOB_NAME', jobName)
return jobParams
}
Expand All @@ -195,13 +188,6 @@ class Build {
arch = "x86-64"
}
def arch_os = "${arch}_${buildConfig.TARGET_OS}"
if (buildConfig.ADDITIONAL_FILE_NAME_TAG) {
switch (buildConfig.ADDITIONAL_FILE_NAME_TAG) {
case ~/.*XL.*/:
arch_os += "_xl";
break
}
}
jobParams.put('ARCH_OS_LIST', arch_os)
jobParams.put('LIGHT_WEIGHT_CHECKOUT', true)
return jobParams
Expand Down
44 changes: 0 additions & 44 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ class Config11 {
]
],

x64MacXL : [
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'macos10.14',
test : 'default',
additionalFileNameTag: "macosXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace=auto --with-cmake'
],

x64Linux : [
os : 'linux',
arch : 'x64',
Expand Down Expand Up @@ -136,41 +127,6 @@ class Config11 {
testDynamic : false
],

x64LinuxXL : [
os : 'linux',
dockerImage : 'adoptopenjdk/centos6_build_image',
dockerFile: [
openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile'
],
arch : 'x64',
test : "default",
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-jitserver --enable-dtrace=auto'
],
s390xLinuxXL : [
os : 'linux',
arch : 's390x',
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace=auto'
],
ppc64leLinuxXL : [
os : 'linux',
arch : 'ppc64le',
additionalNodeLabels : 'centos7',
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace=auto --enable-jitserver'
],
aarch64LinuxXL : [
os : 'linux',
dockerImage : 'adoptopenjdk/centos7_build_image',
arch : 'aarch64',
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace=auto',
testDynamic : false
],
riscv64Linux : [
os : 'linux',
dockerImage : [
Expand Down
60 changes: 0 additions & 60 deletions pipelines/jobs/configurations/jdk16u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@ class Config16 {
configureArgs : '--enable-dtrace'
],

x64MacXL : [
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'macos10.14',
test : 'default',
additionalFileNameTag: "macosXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace'
],

x64Linux : [
os : 'linux',
arch : 'x64',
Expand All @@ -37,21 +28,6 @@ class Config16 {
]
],

x64LinuxXL : [
os : 'linux',
arch : 'x64',
dockerImage : 'adoptopenjdk/centos7_build_image',
dockerFile: [
openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile'
],
test : 'default',
additionalTestLabels: [
openj9 : '!(centos6||rhel6)'
],
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace --enable-jitserver'
],

x64AlpineLinux : [
os : 'alpine-linux',
arch : 'x64',
Expand All @@ -66,15 +42,6 @@ class Config16 {
test : 'default'
],

x64WindowsXL: [
os : 'windows',
arch : 'x64',
additionalNodeLabels : 'win2012&&vs2017',
test : 'default',
additionalFileNameTag: "windowsXL",
configureArgs : '--with-noncompressedrefs'
],

// TODO: Enable testing (https://github.com/adoptium/ci-jenkins-pipelines/issues/77)
aarch64Windows: [
os : 'windows',
Expand Down Expand Up @@ -118,14 +85,6 @@ class Config16 {
configureArgs : '--enable-dtrace'
],

s390xLinuxXL : [
os : 'linux',
arch : 's390x',
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace'
],

ppc64leLinux : [
os : 'linux',
arch : 'ppc64le',
Expand All @@ -138,15 +97,6 @@ class Config16 {

],

ppc64leLinuxXL : [
os : 'linux',
arch : 'ppc64le',
additionalNodeLabels : 'centos7',
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --disable-ccache --enable-dtrace'
],

aarch64Linux : [
os : 'linux',
arch : 'aarch64',
Expand All @@ -156,16 +106,6 @@ class Config16 {
testDynamic : false
],

aarch64LinuxXL : [
os : 'linux',
dockerImage : 'adoptopenjdk/centos7_build_image',
arch : 'aarch64',
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace',
testDynamic : false
],

arm32Linux : [
os : 'linux',
arch : 'arm',
Expand Down
62 changes: 1 addition & 61 deletions pipelines/jobs/configurations/jdk17_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@ class Config17 {
configureArgs : '--enable-dtrace'
],

x64MacXL : [
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'macos10.14',
test : 'default',
additionalFileNameTag: "macosXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace'
],

x64Linux : [
os : 'linux',
arch : 'x64',
Expand All @@ -37,21 +28,6 @@ class Config17 {
]
],

x64LinuxXL : [
os : 'linux',
arch : 'x64',
dockerImage : 'adoptopenjdk/centos7_build_image',
dockerFile: [
openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile'
],
test : 'default',
additionalTestLabels: [
openj9 : '!(centos6||rhel6)'
],
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace --enable-jitserver'
],

x64AlpineLinux : [
os : 'alpine-linux',
arch : 'x64',
Expand All @@ -66,15 +42,6 @@ class Config17 {
test : 'default'
],

x64WindowsXL: [
os : 'windows',
arch : 'x64',
additionalNodeLabels : 'win2012&&vs2017',
test : 'default',
additionalFileNameTag: "windowsXL",
configureArgs : '--with-noncompressedrefs'
],

// TODO: Enable testing (https://github.com/adoptium/ci-jenkins-pipelines/issues/77)
aarch64Windows: [
os : 'windows',
Expand Down Expand Up @@ -118,14 +85,6 @@ class Config17 {
configureArgs : '--enable-dtrace'
],

s390xLinuxXL : [
os : 'linux',
arch : 's390x',
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace'
],

ppc64leLinux : [
os : 'linux',
arch : 'ppc64le',
Expand All @@ -138,15 +97,6 @@ class Config17 {

],

ppc64leLinuxXL : [
os : 'linux',
arch : 'ppc64le',
additionalNodeLabels : 'centos7',
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --disable-ccache --enable-dtrace'
],

aarch64Linux : [
os : 'linux',
arch : 'aarch64',
Expand All @@ -155,17 +105,7 @@ class Config17 {
configureArgs : '--enable-dtrace',
testDynamic : false
],

aarch64LinuxXL : [
os : 'linux',
dockerImage : 'adoptopenjdk/centos7_build_image',
arch : 'aarch64',
test : 'default',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-dtrace',
testDynamic : false
],


aarch64Mac: [
os : 'mac',
arch : 'aarch64',
Expand Down
45 changes: 0 additions & 45 deletions pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ class Config8 {
test : 'default'
],

x64MacXL : [
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'macos10.14',
test : 'default',
additionalFileNameTag: "macosXL",
configureArgs : '--with-noncompressedrefs'
],

x64Linux : [
os : 'linux',
arch : 'x64',
Expand All @@ -41,15 +32,6 @@ class Config8 {
test : 'default'
],

x64WindowsXL : [
os : 'windows',
arch : 'x64',
additionalNodeLabels : 'win2012',
test : 'default',
additionalFileNameTag: "windowsXL",
configureArgs : '--with-noncompressedrefs'
],

x32Windows : [
os : 'windows',
arch : 'x86-32',
Expand Down Expand Up @@ -118,33 +100,6 @@ class Config8 {
test : 'default',
testDynamic : false
],

x64LinuxXL : [
os : 'linux',
dockerImage : 'adoptopenjdk/centos6_build_image',
dockerFile: [
openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile'
],
arch : 'x64',
additionalFileNameTag: "linuxXL",
configureArgs : '--with-noncompressedrefs --enable-jitserver',
test : 'default'
],
s390xLinuxXL : [
os : 'linux',
arch : 's390x',
additionalFileNameTag: "linuxXL",
test : 'default',
configureArgs : '--with-noncompressedrefs'
],
ppc64leLinuxXL : [
os : 'linux',
arch : 'ppc64le',
additionalNodeLabels : 'centos7',
additionalFileNameTag: "linuxXL",
test : 'default',
configureArgs : '--with-noncompressedrefs --enable-jitserver'
],
]

}
Expand Down

0 comments on commit 5247c3a

Please sign in to comment.