diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy index 385fd5d54..1571d0f23 100644 --- a/pipelines/build/common/build_base_file.groovy +++ b/pipelines/build/common/build_base_file.groovy @@ -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)) { diff --git a/pipelines/build/common/config_regeneration.groovy b/pipelines/build/common/config_regeneration.groovy index 8448a0c2e..c8f275bd3 100644 --- a/pipelines/build/common/config_regeneration.groovy +++ b/pipelines/build/common/config_regeneration.groovy @@ -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)) { diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index 431cc731c..237bae0ed 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -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 } @@ -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 diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index dca524b35..1d4b05bc8 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -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', @@ -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 : [ diff --git a/pipelines/jobs/configurations/jdk16u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk16u_pipeline_config.groovy index 415c48d1d..ba55be1fa 100644 --- a/pipelines/jobs/configurations/jdk16u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk16u_pipeline_config.groovy @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', diff --git a/pipelines/jobs/configurations/jdk17_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17_pipeline_config.groovy index 8110bcb87..01d3ffd48 100644 --- a/pipelines/jobs/configurations/jdk17_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk17_pipeline_config.groovy @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', @@ -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', diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy index 23d5fd735..c3bb89c97 100644 --- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy @@ -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', @@ -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', @@ -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' - ], ] }