summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-01-12 13:38:59 -0500
committerGitHub <noreply@github.com>2021-01-12 13:38:59 -0500
commitb5c8cee932e046d6b5df08a8d237ca9d838228f6 (patch)
tree4807f673f82935a3f3b306a152e89e529816c5f2 /contrib
parentdb5e7ec4c42adf8ff97d9b19116ab6dbcbb616cd (diff)
parent201d853283644c8d5d156a8507232cff1549a45c (diff)
downloadpodman-b5c8cee932e046d6b5df08a8d237ca9d838228f6.tar.gz
podman-b5c8cee932e046d6b5df08a8d237ca9d838228f6.tar.bz2
podman-b5c8cee932e046d6b5df08a8d237ca9d838228f6.zip
Merge pull request #8900 from cevich/no_tag_testing
Cirrus: Skip most tests on tag-push
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/cirrus/runner.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index e09b2af9c..2f909876a 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -202,8 +202,16 @@ function _run_altbuild() {
}
function _run_release() {
- if bin/podman info |& grep -Eq -- '-dev'; then
- die "Releases must never contain '-dev' in output of 'podman info'"
+ # TODO: These tests should come from code external to the podman repo.
+ # to allow test-changes (and re-runs) in the case of a correctible test
+ # flaw or flake at release tag-push time. For now, the test is here
+ # given it's simplicity.
+
+ msg "Checking podman release (or potential release) criteria."
+ info_output=$(bin/podman info 2>&1)
+ if grep -q -- '-dev'<<<"$info_output"; then
+ die "Releases must never contain '-dev' in output of 'podman info':
+$info_output"
fi
}