From 22fc6f3ec2b81552639ace80fd67ab020a01fb85 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 9 Apr 2021 18:05:28 +0200 Subject: [PATCH] Test for testing Signed-off-by: Adrian Reber --- criu.spec | 5 ++++- gating.yaml | 10 ++++++---- tests/run-podman-checkpoint-restore.sh | 15 +++++---------- tests/run-zdtm.sh | 13 ------------- tests/tests.yml | 4 ++++ 5 files changed, 19 insertions(+), 28 deletions(-) diff --git a/criu.spec b/criu.spec index 445c9b2..33eeef0 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 3.15 -Release: 3%{?dist} +Release: 4%{?dist} Provides: crtools = %{version}-%{release} Obsoletes: crtools <= 1.0-2 Summary: Tool for Checkpoint/Restore in User-space @@ -185,6 +185,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %changelog +* Fri Apr 09 2021 Adrian Reber - 3.15-4 +- Test for testing + * Tue Jan 26 2021 Fedora Release Engineering - 3.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/gating.yaml b/gating.yaml index c80192d..bb1d8ee 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,12 +1,14 @@ --- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_testing +decision_contexts: [bodhi_update_push_testing] +subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional } + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} --- !Policy product_versions: - fedora-* -decision_context: bodhi_update_push_stable +decision_contexts: [bodhi_update_push_stable] +subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional } + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/tests/run-podman-checkpoint-restore.sh b/tests/run-podman-checkpoint-restore.sh index 525755f..845d0b4 100755 --- a/tests/run-podman-checkpoint-restore.sh +++ b/tests/run-podman-checkpoint-restore.sh @@ -4,18 +4,14 @@ set -eux ls -la -echo "Start container with tomcat" -podman --log-level debug run --tmpfs /tmp --tmpfs /usr/local/tomcat/logs -d docker://docker.io/yovfiatbeb/podman-criu-test +echo "Start container" +podman --log-level debug run -d quay.io/adrianreber/counter echo "See which containers are running" podman ps -# tomcat needs some time to start up -echo "Wait 15 seconds for tomcat to start" -sleep 15 - -echo "Connect to tomcat in the container" -curl `podman inspect -l | jq -r '.[0].NetworkSettings.IPAddress'`:8080/examples/servlets/servlet/HelloWorldExample -v +echo "Connect to the container" +curl `podman inspect -l | jq -r '.[0].NetworkSettings.IPAddress'`:8088 echo "Checkpoint container" podman --log-level debug container checkpoint -l @@ -26,7 +22,6 @@ podman --log-level debug container restore -l podman ps -a echo "Check if we can connect to the restored container" -curl `podman inspect -l | jq -r '.[0].NetworkSettings.IPAddress'`:8080/examples/servlets/servlet/HelloWorldExample -v +curl `podman inspect -l | jq -r '.[0].NetworkSettings.IPAddress'`:8088 ls -la -echo test diff --git a/tests/run-zdtm.sh b/tests/run-zdtm.sh index 7ad7d25..58a1143 100755 --- a/tests/run-zdtm.sh +++ b/tests/run-zdtm.sh @@ -4,19 +4,6 @@ set -x uname -a -# Two IPv6 related tests are failing in CI, not sure why. -echo "Network setup" -cat /etc/hosts -ip a -ping localhost -c 3 -4 -ping localhost -c 3 -6 -ping localhost -c 3 - -ip route save > /tmp/test -echo $? -file /tmp/test -rpm -q iproute - # These zdtm tests are skipped because they fail only in CI system EXCLUDES=" \ -x zdtm/static/socket-tcp-reseted \ diff --git a/tests/tests.yml b/tests/tests.yml index 8571458..6e498e2 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -26,7 +26,11 @@ - nftables-devel - python3-pyyaml - python3-protobuf + - python-unversioned-command tests: - zdtm: dir: . run: ./run-zdtm.sh + - podman: + dir: . + run: ./run-podman-checkpoint-restore.sh