From 90f82335d95635bfa49db589233a989a0e8bd0aa Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Fri, 20 Sep 2019 15:41:06 -0400
Subject: Cirrus: Fail early on CI script unit test

Instead of running this basic checks for almost all tasks, just do them
once at the beginning.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml | 6 ++++++
 Makefile    | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 95092a900..f302d8a89 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -117,6 +117,12 @@ gating_task:
         - '/usr/local/bin/entrypoint.sh podman-remote-darwin |& ${TIMESTAMP}'
         - '/usr/local/bin/entrypoint.sh podman-remote-windows |& ${TIMESTAMP}'
 
+    # Verify some aspects of ci/related scripts
+    ci_script:
+        - '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/lib.sh.t |& ${TIMESTAMP}'
+        - '/usr/local/bin/entrypoint.sh -C ${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/packer test'
+        - '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/cirrus_yaml_test.py |& ${TIMESTAMP}'
+
     # Verify expected bash environment (-o pipefail)
     pipefail_enabledscript: 'if /bin/false | /bin/true; then echo "pipefail fault" && exit 72; fi'
 
diff --git a/Makefile b/Makefile
index 6734ef1b0..66c971d3e 100644
--- a/Makefile
+++ b/Makefile
@@ -245,9 +245,6 @@ localunit: test/goecho/goecho varlink_generate
 		--covermode atomic \
 		--tags "$(BUILDTAGS)" \
 		--succinct
-	$(MAKE) -C contrib/cirrus/packer test
-	./contrib/cirrus/lib.sh.t
-	./contrib/cirrus/cirrus_yaml_test.py
 
 ginkgo:
 	ginkgo -v -tags "$(BUILDTAGS)" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor -nodes 3 -debug test/e2e/.
-- 
cgit v1.2.3-54-g00ecf