From bc2f0bd4b5eec4fc607a9b71329d91284d0a837f Mon Sep 17 00:00:00 2001
From: Lan Xia <Lan_Xia@ca.ibm.com>
Date: Thu, 29 Jun 2023 17:56:34 -0400
Subject: [PATCH] Reenable PingPerf on zlinux, alinux and plinux (#4653)

related: https://github.com/adoptium/aqa-tests/issues/4632 and https://github.com/OpenLiberty/ci.docker/pull/412

Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>
---
 buildenv/jenkins/openjdk_tests |  4 ----
 external/criu/pingPerf.sh      |  2 --
 external/criu/playlist.xml     | 28 ----------------------------
 3 files changed, 34 deletions(-)

diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests
index de7412f527..3e58c48047 100644
--- a/buildenv/jenkins/openjdk_tests
+++ b/buildenv/jenkins/openjdk_tests
@@ -234,12 +234,8 @@ timestamps{
             def target = "testList TESTLIST=disabled.criu_pingPerf_testCreateRestoreImageAndPushToRegistry,disabled.criu-portable-checkpoint_test,disabled.criu-ubi-portable-checkpoint_test"
 
             // exclude criu-portable-checkpoint_test on plinux due to github_ibm/runtimes/backlog/issues/1099
-            // exclude criu_pingPerf_testCreateRestoreImageAndPushToRegistry on plinux, zlinux and alinux due to https://github.com/adoptium/aqa-tests/issues/4632
             if (params.PLATFORM == "ppc64le_linux") {
                 target = target.minus("disabled.criu-portable-checkpoint_test,")
-                target = target.minus("disabled.criu_pingPerf_testCreateRestoreImageAndPushToRegistry,")
-            } else if (params.PLATFORM == "s390x_linux" || params.PLATFORM == "aarch64_linux") {
-                target = target.minus("disabled.criu_pingPerf_testCreateRestoreImageAndPushToRegistry,")
             }
 
             echo "Trigger ${imageUploadJobName} job ..."
diff --git a/external/criu/pingPerf.sh b/external/criu/pingPerf.sh
index 3b5850d5e8..3184f59a0a 100755
--- a/external/criu/pingPerf.sh
+++ b/external/criu/pingPerf.sh
@@ -83,8 +83,6 @@ prepare() {
     git clone https://github.com/OpenLiberty/ci.docker.git
     (
         cd ci.docker || exit
-        openLibertyBranch="instanton"
-        git checkout $openLibertyBranch
         if [ "$OPENLIBERTY_SHA" != "" ]
         then
             git checkout $OPENLIBERTY_SHA
diff --git a/external/criu/playlist.xml b/external/criu/playlist.xml
index 2d8792db9f..cec955037f 100644
--- a/external/criu/playlist.xml
+++ b/external/criu/playlist.xml
@@ -20,13 +20,6 @@
 		$(TEST_STATUS); \
 		$(TEST_ROOT)/external/criu/pingPerf.sh clean
 		</command>
-		<disables>
-			<disable>
-				<comment>https://github.com/adoptium/aqa-tests/issues/4632</comment>
-				<platform>(?:s390x_linux.*|aarch64_linux.*|ppc64le_linux.*)</platform>
-				<impl>openj9</impl>
-			</disable>
-		</disables>
 		<features>
 			<feature>CRIU:required</feature>
 		</features>
@@ -43,13 +36,6 @@
 		$(TEST_STATUS); \
 		$(TEST_ROOT)/external/criu/pingPerf.sh clean
 		</command>
-		<disables>
-			<disable>
-				<comment>https://github.com/adoptium/aqa-tests/issues/4632</comment>
-				<platform>(?:s390x_linux.*|aarch64_linux.*|ppc64le_linux.*)</platform>
-				<impl>openj9</impl>
-			</disable>
-		</disables>
 		<features>
 			<feature>CRIU:required</feature>
 		</features>
@@ -87,13 +73,6 @@
 		$(TEST_STATUS); \
 		$(TEST_ROOT)/external/criu/pingPerf.sh clean
 		</command>
-		<disables>
-			<disable>
-				<comment>https://github.com/adoptium/aqa-tests/issues/4632</comment>
-				<platform>(?:s390x_linux.*|aarch64_linux.*|ppc64le_linux.*)</platform>
-				<impl>openj9</impl>
-			</disable>
-		</disables>
 		<features>
 			<feature>CRIU:required</feature>
 		</features>
@@ -110,13 +89,6 @@
 		$(TEST_STATUS); \
 		$(TEST_ROOT)/external/criu/pingPerf.sh clean
 		</command>
-		<disables>
-			<disable>
-				<comment>https://github.com/adoptium/aqa-tests/issues/4632</comment>
-				<platform>(?:s390x_linux.*|aarch64_linux.*|ppc64le_linux.*)</platform>
-				<impl>openj9</impl>
-			</disable>
-		</disables>
 		<features>
 			<feature>CRIU:required</feature>
 		</features>