diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-25 09:45:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 09:45:47 +0200 |
| commit | a5b24816c75e97c4992c648c219df5792594a3a1 (patch) | |
| tree | 4a699eb085ca7ad729751ebbaa694936af2bd99f | |
| parent | 729175ad84ecc0fa745f11760a58c90d879cecf7 (diff) | |
| parent | 90f82335d95635bfa49db589233a989a0e8bd0aa (diff) | |
| download | podman-a5b24816c75e97c4992c648c219df5792594a3a1.tar.gz podman-a5b24816c75e97c4992c648c219df5792594a3a1.tar.bz2 podman-a5b24816c75e97c4992c648c219df5792594a3a1.zip | |
Merge pull request #4073 from cevich/move_ci_unit_test
Cirrus: Fail early on CI script unit test
| -rw-r--r-- | .cirrus.yml | 6 | ||||
| -rw-r--r-- | Makefile | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 241ac4b2b..d128337c3 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' @@ -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/. |