From fd3fe4a26a4d9217392b1c0353751419d0c2b8b5 Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Mon, 6 Nov 2023 14:41:23 -0500 Subject: [PATCH] enable CRIU portable testing on rhel8 Signed-off-by: Lan Xia --- 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 32d7267207..312bca036f 100644 --- a/buildenv/jenkins/openjdk_tests +++ b/buildenv/jenkins/openjdk_tests @@ -181,7 +181,7 @@ timestamps{ 'aarch64_linux' : [ // no machine available ['LABEL_ADDITION' : "${commonLabel}&&sw.os.ubuntu.20"], ['LABEL_ADDITION' : "${commonLabel}&&sw.os.ubuntu.22&&hw.arch.aarch64.armv8"], - // no machine available ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8"], + ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8&&hw.arch.aarch64.armv8"], ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.9&&hw.arch.aarch64.armv8"] ], 's390x_linux' : [ @@ -210,7 +210,7 @@ timestamps{ ], 'aarch64_linux' : [ ['LABEL_ADDITION' : "${commonLabel}&&sw.os.ubuntu.22"], - // no machine available ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8"], + ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8"], ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.9"] ], 's390x_linux' : [ diff --git a/external/criuSettings.mk b/external/criuSettings.mk index baacd4bbe3..15a38131cd 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.ubuntu.22-hw.arch.aarch64.armv8 sw.os.rhel.9-hw.arch.aarch64.armv8 -# not available: sw.os.rhel.8-hw.arch.aarch64.armv8 sw.os.ubuntu.20-hw.arch.aarch64.armv8 +export CRIU_COMBO_LIST_linux_aarch64=sw.os.ubuntu.22-hw.arch.aarch64.armv8 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 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