From 9cc06c0b7b71e27fab47114079d12b1520824506 Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Fri, 1 Sep 2023 14:26:48 -0400 Subject: [PATCH] Update jenkins pipeline * remove jdk20 from list of current releases * remove settings for jdk20 from defaults.yml * add alinux as another alias for aarch64_linux * fix typo * indent consistently Signed-off-by: Keith W. Campbell --- .../jobs/pipelines/Pipeline-Build-Test-All.groovy | 15 ++++++++------- buildenv/jenkins/variables/defaults.yml | 11 ----------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy b/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy index 58c714cdc12..739dea5bbe3 100644 --- a/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy +++ b/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy @@ -66,7 +66,7 @@ * ENABLE_SUMMARY_AUTO_REFRESH: Boolean - flag to enable the downstream summary auto-refresh, default: false */ -CURRENT_RELEASES = ['8', '11', '17', '20', '21', 'next'] +CURRENT_RELEASES = ['8', '11', '17', '21', 'next'] SPECS = ['ppc64_aix' : CURRENT_RELEASES, 'ppc64le_linux' : CURRENT_RELEASES, @@ -124,7 +124,7 @@ SPECS = ['ppc64_aix' : CURRENT_RELEASES, // SHORT_NAMES is used for PullRequest triggers // TODO Combine SHORT_NAMES and SPECS -SHORT_NAMES = ['all' : ['ppc64le_linux','s390x_linux','x86-64_linux','ppc64_aix','x86-64_windows','x86-32_windows','x86-64_mac', 'aarch64_linux', 'aarch64_mac'], +SHORT_NAMES = ['all' : ['ppc64le_linux', 's390x_linux', 'x86-64_linux', 'ppc64_aix', 'x86-64_windows', 'x86-32_windows', 'x86-64_mac', 'aarch64_linux', 'aarch64_mac'], 'aix' : ['ppc64_aix'], 'zlinux' : ['s390x_linux'], 'zlinuxcriu' : ['s390x_linux_criu'], @@ -144,6 +144,7 @@ SHORT_NAMES = ['all' : ['ppc64le_linux','s390x_linux','x86-64_linux','ppc64_aix' 'win' : ['x86-64_windows'], 'osx' : ['x86-64_mac'], 'xmac' : ['x86-64_mac'], + 'alinux' : ['aarch64_linux'], 'alinux64' : ['aarch64_linux'], 'alinux64criu' : ['aarch64_linux_criu'], 'alinux64gcc11' : ['aarch64_linux_gcc11'], @@ -501,7 +502,7 @@ def get_node_labels(NODE_LABELS, SPECS) { NODE_LABELS.trim().split(",").each { ITEM -> def ENTRY = ITEM.trim().split("=") if (ENTRY.size() != 2) { - error("Invalid format for node labels: ${ITEM}! Expected value: spec1=labels1,spec2=labels2,...,specNe=labelsN e.g. aix_ppc-64_cmprssptrs=csp70027,linux_x86-64=(ci.project.openj9 && hw.arch.x86 && sw.os.ubuntu.14)") + error("Invalid format for node labels: ${ITEM}! Expected value: spec1=labels1,spec2=labels2,...,specN=labelsN e.g. aix_ppc-64_cmprssptrs=csp70027,linux_x86-64=(ci.project.openj9 && hw.arch.x86 && sw.os.ubuntu.14)") } if (!SPECS.contains(ENTRY[0].trim())) { @@ -687,10 +688,10 @@ def draw_summary_table() { if (ENABLE_SUMMARY_AUTO_REFRESH) { def actions = manager.build.actions for (int i = 0; i < actions.size(); i++) { - def action = actions.get(i) - if (action.metaClass && action.metaClass.hasProperty(action, "text") && action.text.contains("Downstream Jobs Status")) { - actions.remove(action) - } + def action = actions.get(i) + if (action.metaClass && action.metaClass.hasProperty(action, "text") && action.text.contains("Downstream Jobs Status")) { + actions.remove(action) + } } } diff --git a/buildenv/jenkins/variables/defaults.yml b/buildenv/jenkins/variables/defaults.yml index 388bb73d8b1..5a8e9201a98 100644 --- a/buildenv/jenkins/variables/defaults.yml +++ b/buildenv/jenkins/variables/defaults.yml @@ -36,10 +36,6 @@ openjdk: default: repoUrl: 'https://github.com/ibmruntimes/openj9-openjdk-jdk17.git' branch: 'openj9' - 20: - default: - repoUrl: 'https://github.com/ibmruntimes/openj9-openjdk-jdk20.git' - branch: 'openj9' 21: default: repoUrl: 'https://github.com/ibmruntimes/openj9-openjdk-jdk21.git' @@ -110,7 +106,6 @@ build_discarder: OpenJDK8: 5 OpenJDK11: 5 OpenJDK17: 10 - OpenJDK20: 10 OpenJDK21: 10 OpenJDK: 10 Personal: 30 @@ -157,7 +152,6 @@ boot_jdk_default: 8: '8' 11: '11' 17: '17' - 20: '19' 21: '20' next: '20' dir_strip: @@ -238,7 +232,6 @@ s390x_linux: extra_test_labels: 11: '!sw.os.rhel.8' 17: '!sw.os.rhel.8' - 20: '!sw.os.rhel.8' 21: '!sw.os.rhel.8' next: '!sw.os.rhel.8' build_env: @@ -272,7 +265,6 @@ ppc64_aix: 8: ' --disable-ccache' 11: '--disable-warnings-as-errors' 17: '--disable-warnings-as-errors' - 20: '--disable-warnings-as-errors' 21: '--disable-warnings-as-errors' next: '--disable-warnings-as-errors' build_env: @@ -280,7 +272,6 @@ ppc64_aix: 8: 'PATH+XLC=/opt/IBM/xlC/13.1.3/bin:/opt/IBM/xlc/13.1.3/bin' 11: 'PATH+XLC=/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin CC=xlclang CXX=xlclang++' 17: 'PATH+XLC=/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin CC=xlclang CXX=xlclang++' - 20: 'PATH+XLC=/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin CC=xlclang CXX=xlclang++' 21: 'PATH+XLC=/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin CC=xlclang CXX=xlclang++' next: 'PATH+XLC=/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin CC=xlclang CXX=xlclang++' #========================================# @@ -314,7 +305,6 @@ x86-64_linux: extra_test_labels: 11: '!sw.os.cent.6' 17: '!sw.os.cent.6' - 20: '!sw.os.cent.6' 21: '!sw.os.cent.6' next: '!sw.os.cent.6' #========================================# @@ -364,7 +354,6 @@ x86-64_windows: 8: '--with-toolchain-version=2019' 11: '--with-toolchain-version=2019' 17: '--with-toolchain-version=2019' - 20: '--with-toolchain-version=2022' 21: '--with-toolchain-version=2022' next: '--with-toolchain-version=2022' node_labels: