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

@@ -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}'
+    build_and_test_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/build_and_test.sh |& ${_TIMESTAMP}'
-    unit_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/unit.sh |& ${_TIMESTAMP}'
-    integration_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/integration.sh |& ${_TIMESTAMP}'
 
     # Log collection when job was successful
     df_script: '${_DFCMD} || true'

contrib/cirrus/integration.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source $(dirname $0)/lib.sh
-
-cd $GOSRC
-/bin/true  # STUB: Add call to execute integration testing

contrib/cirrus/lib.sh

@@ -175,6 +175,7 @@ showrun() {
         "$@" &
         echo -e "${RED}<backgrounded>${NOR}"
     else
+        echo '--------------------------------------------------'
         echo '+ '$(printf " %q" "$@") > /dev/stderr
         "$@"
     fi

contrib/cirrus/unit.sh

@@ -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