From 4aaf0f477ffe6e4fbe8088e26ab14ef40406fb31 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Mon, 8 Apr 2024 14:53:44 +0100 Subject: [PATCH] Remove jdk22 pipelines as top level pipelines prefer these to 22u Signed-off-by: Stewart X Addison --- pipelines/jobs/configurations/jdk22.groovy | 50 ------ .../configurations/jdk22_evaluation.groovy | 13 -- .../jdk22_pipeline_config.groovy | 163 ------------------ .../jobs/configurations/jdk22_release.groovy | 37 ---- 4 files changed, 263 deletions(-) delete mode 100644 pipelines/jobs/configurations/jdk22.groovy delete mode 100644 pipelines/jobs/configurations/jdk22_evaluation.groovy delete mode 100644 pipelines/jobs/configurations/jdk22_pipeline_config.groovy delete mode 100644 pipelines/jobs/configurations/jdk22_release.groovy diff --git a/pipelines/jobs/configurations/jdk22.groovy b/pipelines/jobs/configurations/jdk22.groovy deleted file mode 100644 index e4cbc054c..000000000 --- a/pipelines/jobs/configurations/jdk22.groovy +++ /dev/null @@ -1,50 +0,0 @@ -targetConfigurations = [ - 'x64Mac' : [ - 'temurin' - ], - 'x64Linux' : [ - 'temurin' - ], - 'x64AlpineLinux' : [ - 'temurin' - ], - 'aarch64AlpineLinux' : [ - 'temurin' - ], - 'x64Windows' : [ - 'temurin' - ], - 'ppc64Aix' : [ - 'temurin' - ], - 'ppc64leLinux': [ - 'temurin' - ], - 's390xLinux' : [ - 'temurin' - ], - 'aarch64Linux': [ - 'hotspot', - 'temurin' - ], - 'aarch64Mac': [ - 'temurin' - ], - 'riscv64Linux': [ - 'temurin' - ] -] - -// 12:05 Sat - Weekend schedule for when Oracle managed jdk22u.groovy version is created -//triggerSchedule_weekly = 'TZ=UTC\n05 12 * * 6' - -// scmReferences to use for weekly release build -weekly_release_scmReferences = [ - 'hotspot' : '', - 'temurin' : '', - 'openj9' : '', - 'corretto' : '', - 'dragonwell' : '' -] - -return this diff --git a/pipelines/jobs/configurations/jdk22_evaluation.groovy b/pipelines/jobs/configurations/jdk22_evaluation.groovy deleted file mode 100644 index 5f821a598..000000000 --- a/pipelines/jobs/configurations/jdk22_evaluation.groovy +++ /dev/null @@ -1,13 +0,0 @@ -targetConfigurations = [ - 'aarch64Windows' : [ - 'temurin' - ] -] - -// scmReferences to use for weekly evaluation release build -weekly_evaluation_scmReferences = [ - 'hotspot' : '', - 'temurin' : '' -] - -return this diff --git a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy deleted file mode 100644 index 02c7fc735..000000000 --- a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy +++ /dev/null @@ -1,163 +0,0 @@ -class Config22 { - - final Map> buildConfigurations = [ - x64Mac : [ - os : 'mac', - arch : 'x64', - additionalNodeLabels: 'xcode15.0.1', - additionalTestLabels: [ - openj9 : '!sw.os.osx.10_11', - temurin : '!sw.os.osx.10_14' - ], - test : 'default', - configureArgs : '--enable-dtrace', - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' - ] - ], - - x64Linux : [ - os : 'linux', - arch : 'x64', - dockerImage : 'adoptopenjdk/centos7_build_image', - dockerFile: [ - openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile' - ], - test: [ - weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'dev.openjdk', 'dev.functional', 'dev.system'] - ], - additionalTestLabels: [ - openj9 : '!(centos6||rhel6)' - ], - configureArgs : [ - 'openj9' : '--enable-dtrace', - 'temurin' : '--enable-dtrace' - ], - buildArgs : [ - 'temurin' : '--create-source-archive --create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b02' - ] - ], - - x64AlpineLinux : [ - os : 'alpine-linux', - arch : 'x64', - dockerImage : 'adoptopenjdk/alpine3_build_image', - test : 'default', - configureArgs : '--enable-headless-only=yes', - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' - ] - ], - - aarch64AlpineLinux : [ - os : 'alpine-linux', - arch : 'aarch64', - dockerImage : 'adoptopenjdk/alpine3_build_image', - test : 'default', - configureArgs : '--enable-headless-only=yes', - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' - ] - ], - - x64Windows: [ - os : 'windows', - arch : 'x64', - additionalNodeLabels: 'win2022&&vs2022', - test : 'default', - configureArgs : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22621.0/ucrt/DLLs/x64'", - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' - ] - ], - - ppc64Aix : [ - os : 'aix', - arch : 'ppc64', - additionalNodeLabels: [ - temurin: 'xlc16&&aix720', - openj9: 'xlc16&&aix715' - ], - test : 'default', - additionalTestLabels: [ - temurin : 'sw.os.aix.7_2' - ], - cleanWorkspaceAfterBuild: true, - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' - ] - ], - - s390xLinux : [ - os : 'linux', - arch : 's390x', - dockerImage : 'rhel7_build_image', - test : 'default', - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit s390x-on-s390x.RH7' - ] - ], - - ppc64leLinux : [ - os : 'linux', - arch : 'ppc64le', - dockerImage : 'adoptopenjdk/centos7_build_image', - test : 'default', - configureArgs : [ - 'openj9' : '--enable-dtrace' - ], - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b02' - ] - ], - - aarch64Linux : [ - os : 'linux', - arch : 'aarch64', - dockerImage : 'adoptopenjdk/centos7_build_image', - test : 'default', - configureArgs : '--enable-dtrace', - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.6.1810-b02' - ] - ], - - aarch64Mac: [ - os : 'mac', - arch : 'aarch64', - additionalNodeLabels: 'xcode15.0.1', - test : 'default', - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' - ] - ], - - riscv64Linux : [ - os : 'linux', - arch : 'riscv64', - crossCompile : 'qemustatic', - dockerImage : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64', - dockerArgs : '--platform linux/riscv64', - test : 'default', - configureArgs : '--enable-headless-only=yes --enable-dtrace', - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' - ] - ], - - aarch64Windows: [ - os : 'windows', - arch : 'aarch64', - crossCompile : 'x64', - additionalNodeLabels: 'win2022&&vs2022', - test : 'default', - buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom --cross-compile' - ] - ] - ] - -} - -Config22 config = new Config22() -return config.buildConfigurations diff --git a/pipelines/jobs/configurations/jdk22_release.groovy b/pipelines/jobs/configurations/jdk22_release.groovy deleted file mode 100644 index a0130bbbf..000000000 --- a/pipelines/jobs/configurations/jdk22_release.groovy +++ /dev/null @@ -1,37 +0,0 @@ -targetConfigurations = [ - 'x64Mac' : [ - 'temurin' - ], - 'x64Linux' : [ - 'temurin' - ], - 'x64AlpineLinux' : [ - 'temurin' - ], - 'aarch64AlpineLinux' : [ - 'temurin' - ], - 'x64Windows' : [ - 'temurin' - ], - 'ppc64Aix' : [ - 'temurin' - ], - 'ppc64leLinux': [ - 'temurin' - ], - 's390xLinux' : [ - 'temurin' - ], - 'aarch64Linux': [ - 'temurin' - ], - 'aarch64Mac': [ - 'temurin' - ], - 'riscv64Linux': [ - 'temurin' - ] -] - -return this