Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reenable PingPerf on zlinux, alinux and plinux #4653

Merged
merged 1 commit into from
Jun 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions buildenv/jenkins/openjdk_tests
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..."
Expand Down
2 changes: 0 additions & 2 deletions external/criu/pingPerf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 0 additions & 28 deletions external/criu/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading