From 4de69da7bd5739a0845e3c0cae751d4c5eb615f4 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 17 Oct 2018 13:03:55 -0400 Subject: Revert "Cirrus: Enable debugging delay on non-zero exit" This reverts commit b610913ef55ac36d0b145a7d20461649650cc5a1. Signed-off-by: Chris Evich --- .cirrus.yml | 2 -- contrib/python/podman/test/test_runner.sh | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 88cdfdab4..764ec6a29 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -19,8 +19,6 @@ env: CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9" CRIO_COMMIT: "662dbb31b5d4f5ed54511a47cde7190c61c28677" RUNC_COMMIT: "ad0f5255060d36872be04de22f8731f38ef2d7b1" - # Enable debugging delay on test-failure if non-empty. - FLAKE_DEBUG_DELAY: 1 # File to update in home-dir with task-specific env. var values ENVLIB: ".bash_profile" # Overrides default location (/tmp/cirrus) for repo clone diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh index 081b90779..65cbd1e9c 100755 --- a/contrib/python/podman/test/test_runner.sh +++ b/contrib/python/podman/test/test_runner.sh @@ -143,18 +143,6 @@ else RETURNCODE=$? fi -if [[ "$RETURNCODE" -ne 0 ]] && [[ -n "$FLAKE_DEBUG_DELAY" ]] -then - cat << EOF > /dev/stderr -***** -***** WARNING: \$FLAKE_DEBUG_DELAY IS SET AND PYTHON-PODMAN TESTS EXITED: $RETURNCODE -***** WARNING: Sleeping for 30 minutes for test-VM preservation oportunity. -***** -EOF - sleep 30m -fi - - pkill -9 podman pkill -9 conmon -- cgit v1.2.3-54-g00ecf