From baea914b3b3c98f2910839a368ac0951f789dadf Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Wed, 29 May 2019 12:17:59 -0400
Subject: [PATCH] Cirrus: Simplify three scripts into one

Also add demarcation line to help identify separate commands in the
output.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml                                    |  4 +---
 contrib/cirrus/{build.sh => build_and_test.sh} |  0
 contrib/cirrus/integration.sh                  |  8 --------
 contrib/cirrus/lib.sh                          |  1 +
 contrib/cirrus/unit.sh                         | 11 -----------
 5 files changed, 2 insertions(+), 22 deletions(-)
 rename contrib/cirrus/{build.sh => build_and_test.sh} (100%)
 delete mode 100755 contrib/cirrus/integration.sh
 delete mode 100755 contrib/cirrus/unit.sh

diff --git a/.cirrus.yml b/.cirrus.yml
index 4c7e20fb7..e10bc5dba 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -57,9 +57,7 @@ testing_task:
 
     # Separate scripts for separate outputs, makes debugging easier.
     setup_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'
-    build_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/build.sh |& ${_TIMESTAMP}'
-    unit_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/unit.sh |& ${_TIMESTAMP}'
-    integration_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/integration.sh |& ${_TIMESTAMP}'
+    build_and_test_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/build_and_test.sh |& ${_TIMESTAMP}'
 
     # Log collection when job was successful
     df_script: '${_DFCMD} || true'
diff --git a/contrib/cirrus/build.sh b/contrib/cirrus/build_and_test.sh
similarity index 100%
rename from contrib/cirrus/build.sh
rename to contrib/cirrus/build_and_test.sh
diff --git a/contrib/cirrus/integration.sh b/contrib/cirrus/integration.sh
deleted file mode 100755
index 872208007..000000000
--- a/contrib/cirrus/integration.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source $(dirname $0)/lib.sh
-
-cd $GOSRC
-/bin/true  # STUB: Add call to execute integration testing
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index d545b6c05..54d5d8daf 100755
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -175,6 +175,7 @@ showrun() {
         "$@" &
         echo -e "${RED}<backgrounded>${NOR}"
     else
+        echo '--------------------------------------------------'
         echo '+ '$(printf " %q" "$@") > /dev/stderr
         "$@"
     fi
diff --git a/contrib/cirrus/unit.sh b/contrib/cirrus/unit.sh
deleted file mode 100755
index 3948d9215..000000000
--- a/contrib/cirrus/unit.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source $(dirname $0)/lib.sh
-
-cd $SCRIPT_BASE
-./lib.sh.t
-
-cd $GOSRC
-/bin/true  # STUB: Add call to other unittests