From a50410467ac7db98b02fc936c8cac7c5b8229f22 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 15 Oct 2018 17:29:20 -0400
Subject: cirrus: Add simple IRC messenger

Add a naive python script that's able to connect to IRC and send a
single line of text to the #podman channel.  Wrap this in a new
library function to ensure nick-name collisions are unlikely.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.cirrus.yml')

diff --git a/.cirrus.yml b/.cirrus.yml
index c00f2d095..8f21a81e8 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -30,6 +30,7 @@ env:
     # Save a little typing (path relative to $CIRRUS_WORKING_DIR)
     SCRIPT_BASE: "./contrib/cirrus"
     PACKER_BASE: "./contrib/cirrus/packer"
+    IRCID: ENCRYPTED[e87bba62a8e924dc70bdb2b66b16f6ab4a60d2870e6e5534ae9e2b0076f483c71c84091c655ca239101e6816c5ec0883]
 
 # Every *_task runs in parallel in separate VMs. The name prefix only for reference
 # in WebUI, and will be followed by matrix details.  This task does all the
-- 
cgit v1.2.3-54-g00ecf


From 0c17f2010a6d296cfcecc6f703c22e185f930d63 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 15 Oct 2018 17:51:43 -0400
Subject: Cirrus: IRC message when cirrus testing successful

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml               |  2 ++
 contrib/cirrus/success.sh | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100755 contrib/cirrus/success.sh

(limited to '.cirrus.yml')

diff --git a/.cirrus.yml b/.cirrus.yml
index 8f21a81e8..88cdfdab4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -63,6 +63,8 @@ full_vm_testing_task:
 
     integration_test_script: $SCRIPT_BASE/integration_test.sh
 
+    success_script: $SCRIPT_BASE/success.sh
+
 
 # This task build new images for future PR testing, but only after a PR merge.
 # These images save needing to install/setup the same environment to test every
diff --git a/contrib/cirrus/success.sh b/contrib/cirrus/success.sh
new file mode 100755
index 000000000..d1daf9043
--- /dev/null
+++ b/contrib/cirrus/success.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+source $(dirname $0)/lib.sh
+
+req_env_var "
+    CIRRUS_TASK_NAME $CIRRUS_TASK_NAME
+    CIRRUS_BRANCH $CIRRUS_BRANCH
+    OS_RELEASE_ID $OS_RELEASE_ID
+    OS_RELEASE_VER $OS_RELEASE_VER
+    CIRRUS_REPO_CLONE_URL $CIRRUS_REPO_CLONE_URL
+"
+
+REF_URL="$(echo $CIRRUS_REPO_CLONE_URL | sed 's/.git$//g')"
+if [[ "$CIRRUS_BRANCH" =~ "pull" ]]
+then
+    REF_URL="$REF_URL/$CIRRUS_BRANCH"  # pull request URL
+else
+    REF_URL="$REF_URL/commits/$CIRRUS_BRANCH"  # branch merge
+fi
+
+ircmsg "Cirrus-CI $CIRRUS_TASK_NAME on $OS_RELEASE_ID-$OS_RELEASE_VER successful for $REF_URL"
-- 
cgit v1.2.3-54-g00ecf


From 4de69da7bd5739a0845e3c0cae751d4c5eb615f4 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
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 <cevich@redhat.com>
---
 .cirrus.yml                               |  2 --
 contrib/python/podman/test/test_runner.sh | 12 ------------
 2 files changed, 14 deletions(-)

(limited to '.cirrus.yml')

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