From a3198bb06f76c7d951d697b6752249430f559984 Mon Sep 17 00:00:00 2001 From: LongyuZhang Date: Mon, 28 Oct 2024 22:28:49 -0400 Subject: [PATCH] Enable Aarch CRIU ubu22 machines (#5723) Enable Aarch CRIU ubu22 machines Signed-off-by: LongyuZhang --- buildenv/jenkins/openjdk_tests | 4 ++-- external/criuSettings.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests index 1efc94a0a0..6c250d6319 100644 --- a/buildenv/jenkins/openjdk_tests +++ b/buildenv/jenkins/openjdk_tests @@ -180,7 +180,7 @@ timestamps{ ], 'aarch64_linux' : [ // no machine available ['LABEL_ADDITION' : "${commonLabel}&&sw.os.ubuntu.20"], - // https://github.ibm.com/runtimes/infrastructure/issues/9721 ['LABEL_ADDITION' : "${commonLabel}&&sw.os.ubuntu.22&&hw.arch.aarch64.armv8"], + ['LABEL_ADDITION' : "${commonLabel}&&sw.os.ubuntu.22&&hw.arch.aarch64.armv8"], ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8&&hw.arch.aarch64.armv8"], ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.9&&hw.arch.aarch64.armv8"] ], @@ -209,7 +209,7 @@ timestamps{ ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.9"] ], 'aarch64_linux' : [ - // no machine available, ibm_git/infrastructure/issues/9721 ['LABEL_ADDITION' : "${commonLabel}&&sw.os.ubuntu.22"], + ['LABEL_ADDITION' : "${commonLabel}&&sw.os.ubuntu.22"], ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8"], ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.9"] ], diff --git a/external/criuSettings.mk b/external/criuSettings.mk index af331278da..8ea50e0fc3 100644 --- a/external/criuSettings.mk +++ b/external/criuSettings.mk @@ -21,8 +21,8 @@ export CRIU_COMBO_LIST_linux_390_64_z13=sw.os.ubuntu.22-hw.arch.s390x.z13 sw.os. export CRIU_COMBO_LIST_linux_390_64_z14=sw.os.ubuntu.22-hw.arch.s390x.z14 sw.os.rhel.8-hw.arch.s390x.z14 sw.os.rhel.9-hw.arch.s390x.z14 sw.os.ubuntu.22-hw.arch.s390x.z15 sw.os.rhel.8-hw.arch.s390x.z15 sw.os.rhel.9-hw.arch.s390x.z15 export CRIU_COMBO_LIST_linux_390_64_z15=sw.os.ubuntu.22-hw.arch.s390x.z15 sw.os.rhel.8-hw.arch.s390x.z15 sw.os.rhel.9-hw.arch.s390x.z15 -export CRIU_COMBO_LIST_linux_aarch64=sw.os.rhel.9-hw.arch.aarch64.armv8 sw.os.rhel.8-hw.arch.aarch64.armv8 -# not available: sw.os.ubuntu.20-hw.arch.aarch64.armv8 sw.os.ubuntu.22-hw.arch.aarch64.armv8 +export CRIU_COMBO_LIST_linux_aarch64=sw.os.rhel.9-hw.arch.aarch64.armv8 sw.os.rhel.8-hw.arch.aarch64.armv8 sw.os.ubuntu.22-hw.arch.aarch64.armv8 +# not available: sw.os.ubuntu.20-hw.arch.aarch64.armv8 export CRIU_COMBO_LIST_linux_ppc_64_p9=sw.os.rhel.9-hw.arch.ppc64le.p9 export CRIU_COMBO_LIST_linux_ppc_64_p10=sw.os.rhel.8-hw.arch.ppc64le.p10