summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-09-20 15:41:06 -0400
committerChris Evich <cevich@redhat.com>2019-09-23 13:41:28 -0400
commit90f82335d95635bfa49db589233a989a0e8bd0aa (patch)
treeecb053d7a35f923b5e2379a84687d963cc0b1777
parentc0eff1a81c2718498aa8e75f7e45bfb688c91482 (diff)
downloadpodman-90f82335d95635bfa49db589233a989a0e8bd0aa.tar.gz
podman-90f82335d95635bfa49db589233a989a0e8bd0aa.tar.bz2
podman-90f82335d95635bfa49db589233a989a0e8bd0aa.zip
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>
-rw-r--r--.cirrus.yml6
-rw-r--r--Makefile3
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/.