diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-15 07:26:29 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-15 07:26:29 -0700 |
commit | 2bc9a3c4bbaade50264b1dbf348d1521cdd8d8b5 (patch) | |
tree | 626da6c549e377c077a2da3e28d3180f5a856aa5 | |
parent | f667a782a40be4ca757ea24d0d1e012fc618bd6a (diff) | |
parent | b610913ef55ac36d0b145a7d20461649650cc5a1 (diff) | |
download | podman-2bc9a3c4bbaade50264b1dbf348d1521cdd8d8b5.tar.gz podman-2bc9a3c4bbaade50264b1dbf348d1521cdd8d8b5.tar.bz2 podman-2bc9a3c4bbaade50264b1dbf348d1521cdd8d8b5.zip |
Merge pull request #1645 from cevich/flake_delay
Cirrus: Enable debugging delay on non-zero exit
-rw-r--r-- | .cirrus.yml | 2 | ||||
-rwxr-xr-x | contrib/python/podman/test/test_runner.sh | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index bc471cb84..c00f2d095 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -19,6 +19,8 @@ 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 65cbd1e9c..081b90779 100755 --- a/contrib/python/podman/test/test_runner.sh +++ b/contrib/python/podman/test/test_runner.sh @@ -143,6 +143,18 @@ 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 |