From daddcdf326276f942db720b32fe74978ab35a26b Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Wed, 13 Sep 2023 16:37:15 -0400 Subject: [PATCH] Remove redundant *_criu platforms CRIU is enabled by default on platforms for all versions that support it. Signed-off-by: Keith W. Campbell --- .../jenkins/common/pipeline-functions.groovy | 5 +--- .../pipelines/Pipeline-Build-Test-All.groovy | 8 ------- buildenv/jenkins/variables/defaults.yml | 24 +------------------ 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/buildenv/jenkins/common/pipeline-functions.groovy b/buildenv/jenkins/common/pipeline-functions.groovy index ac4ea5ec7e6..35a2918a9ef 100644 --- a/buildenv/jenkins/common/pipeline-functions.groovy +++ b/buildenv/jenkins/common/pipeline-functions.groovy @@ -424,9 +424,6 @@ def workflow(SDK_VERSION, SPEC, SHAS, OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, def keepReportDir = target['keepReportDir'] def buildList = target['buildList'] - if (SPEC.contains("_criu")) { - extraTestLabels = extraTestLabels ? extraTestLabels + "&&ci.role.test.criu" : "ci.role.test.criu" - } echo "Test:'${id}' testFlag:'${testFlag}' extraTestLabels:'${extraTestLabels}', keepReportDir:'${keepReportDir}'" def testJobName = get_test_job_name(id, SPEC, SDK_VERSION, BUILD_IDENTIFIER) @@ -803,7 +800,7 @@ def move_spec_suffix_to_id(spec, id) { def spec_id = [:] spec_id['spec'] = spec spec_id['id'] = id - for (suffix in ['aot', 'cm', 'criu', 'jit', 'ojdk292', 'uma', 'valhalla', 'vt_standard']) { + for (suffix in ['aot', 'cm', 'jit', 'ojdk292', 'uma', 'valhalla', 'vt_standard']) { if (spec.contains("_${suffix}")) { spec_id['spec'] = spec - "_${suffix}" spec_id['id'] = "${suffix}_" + id diff --git a/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy b/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy index 739dea5bbe3..d1c7b3435d2 100644 --- a/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy +++ b/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy @@ -70,16 +70,13 @@ CURRENT_RELEASES = ['8', '11', '17', '21', 'next'] SPECS = ['ppc64_aix' : CURRENT_RELEASES, 'ppc64le_linux' : CURRENT_RELEASES, - 'ppc64le_linux_criu' : CURRENT_RELEASES, 'ppc64le_linux_gcc11': CURRENT_RELEASES, 'ppc64le_linux_jit' : CURRENT_RELEASES, 's390x_linux' : CURRENT_RELEASES, - 's390x_linux_criu' : CURRENT_RELEASES, 's390x_linux_gcc11': CURRENT_RELEASES, 's390x_linux_jit' : CURRENT_RELEASES, 's390x_zos' : CURRENT_RELEASES, 'x86-64_linux' : CURRENT_RELEASES, - 'x86-64_linux_criu': CURRENT_RELEASES, 'x86-64_linux_gcc11': CURRENT_RELEASES, 'x86-64_linux_jit' : CURRENT_RELEASES, 'x86-64_linux_valhalla' : ['next'], @@ -88,7 +85,6 @@ SPECS = ['ppc64_aix' : CURRENT_RELEASES, 'x86-32_windows' : ['8'], 'x86-64_windows' : CURRENT_RELEASES, 'aarch64_linux' : CURRENT_RELEASES, - 'aarch64_linux_criu': CURRENT_RELEASES, 'aarch64_linux_gcc11' : CURRENT_RELEASES, 'aarch64_linux_jit' : CURRENT_RELEASES, 'aarch64_mac' : CURRENT_RELEASES - '8', @@ -127,15 +123,12 @@ SPECS = ['ppc64_aix' : CURRENT_RELEASES, 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'], 'zlinuxgcc11' : ['s390x_linux_gcc11'], 'zlinuxjit' : ['s390x_linux_jit'], 'plinux' : ['ppc64le_linux'], - 'plinuxcriu' : ['ppc64le_linux_criu'], 'plinuxgcc11' : ['ppc64le_linux_gcc11'], 'plinuxjit' : ['ppc64le_linux_jit'], 'xlinux' : ['x86-64_linux'], - 'xlinuxcriu' : ['x86-64_linux_criu'], 'xlinuxgcc11' : ['x86-64_linux_gcc11'], 'xlinuxjit' : ['x86-64_linux_jit'], 'xlinuxval' : ['x86-64_linux_valhalla'], @@ -146,7 +139,6 @@ SHORT_NAMES = ['all' : ['ppc64le_linux', 's390x_linux', 'x86-64_linux', 'ppc64_a 'xmac' : ['x86-64_mac'], 'alinux' : ['aarch64_linux'], 'alinux64' : ['aarch64_linux'], - 'alinux64criu' : ['aarch64_linux_criu'], 'alinux64gcc11' : ['aarch64_linux_gcc11'], 'alinux64jit' : ['aarch64_linux_jit'], 'amac' : ['aarch64_mac'], diff --git a/buildenv/jenkins/variables/defaults.yml b/buildenv/jenkins/variables/defaults.yml index 665c88ecd42..af8ffe7ead3 100644 --- a/buildenv/jenkins/variables/defaults.yml +++ b/buildenv/jenkins/variables/defaults.yml @@ -159,12 +159,7 @@ boot_jdk_default: url: all: 'https://api.adoptopenjdk.net/v3/binary/latest/${bootJDKVersion}/ga/${os}/${arch}/jdk/openj9/normal/adoptopenjdk?project=jdk' #========================================# -# CRIU -#========================================# -criu: - extra_configure_options: '--enable-criu-support' -#========================================# -# Cuda +# CUDA #========================================# cuda: extra_configure_options: '--enable-cuda' @@ -505,23 +500,6 @@ s390x_linux_valhalla: s390x_linux_vt_standard: extends: ['s390x_linux', 'valhalla_standard'] #========================================# -# CRIU -#========================================# -x86-64_linux_criu: - extends: ['x86-64_linux', 'criu'] - node_labels: - build: - all: 'ci.role.build && hw.arch.x86 && sw.os.cent.7' - docker_image: - 8: '' - 11: '' -ppc64le_linux_criu: - extends: ['ppc64le_linux', 'criu'] -s390x_linux_criu: - extends: ['s390x_linux', 'criu'] -aarch64_linux_criu: - extends: ['aarch64_linux', 'criu'] -#========================================# # Linux x86 64bits compiled with GCC 11 #========================================# x86-64_linux_gcc11: