From f8c3e09e45a28385a49ea62bdba611be4e815565 Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Thu, 11 May 2023 16:08:53 -0400 Subject: [PATCH] Add rhel9 for CRIU Signed-off-by: Lan Xia --- buildenv/jenkins/openjdk_tests | 7 +++++-- external/criuSettings.mk | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests index 2620635b30..f199425eda 100644 --- a/buildenv/jenkins/openjdk_tests +++ b/buildenv/jenkins/openjdk_tests @@ -174,13 +174,16 @@ timestamps{ ['LABEL_ADDITION' : "${commonLabel}&&sw.os.ubuntu.22&&hw.arch.x86.amd"], ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8&&hw.arch.x86.broadwell"], ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8&&hw.arch.x86.amd"], - ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8&&hw.arch.x86.skylake"] + ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8&&hw.arch.x86.skylake"], + ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.9&&hw.arch.x86.amd"], + ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.9&&hw.arch.x86.skylake"] ] ] def imagePullMap = [ 'x86-64_linux' : [ ['LABEL_ADDITION' : "${commonLabel}&&sw.os.ubuntu.22"], - ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8"] + ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.8"], + ['LABEL_ADDITION' : "${commonLabel}&&sw.os.rhel.9"] ] ] if (params.PLATFORM && imageUploadMap[params.PLATFORM] != null && imagePullMap[params.PLATFORM] != null) { diff --git a/external/criuSettings.mk b/external/criuSettings.mk index c8bad8dcb0..ecf6817234 100644 --- a/external/criuSettings.mk +++ b/external/criuSettings.mk @@ -12,5 +12,5 @@ # limitations under the License. ############################################################################## -export CRIU_XLINUX_COMBO_LIST=sw.os.ubuntu.22-hw.arch.x86.broadwell sw.os.ubuntu.22-hw.arch.x86.amd sw.os.rhel.8-hw.arch.x86.broadwell sw.os.rhel.8-hw.arch.x86.amd sw.os.rhel.8-hw.arch.x86.skylake -# not available: sw.os.ubuntu.22-hw.arch.x86.skylake +export CRIU_XLINUX_COMBO_LIST=sw.os.ubuntu.22-hw.arch.x86.broadwell sw.os.ubuntu.22-hw.arch.x86.amd sw.os.rhel.8-hw.arch.x86.broadwell sw.os.rhel.8-hw.arch.x86.amd sw.os.rhel.8-hw.arch.x86.skylake sw.os.rhel.9-hw.arch.x86.amd sw.os.rhel.9-hw.arch.x86.skylake +# not available: sw.os.ubuntu.22-hw.arch.x86.skylake sw.os.rhel.9-hw.arch.x86.broadwell