Merge pull request #8900 from cevich/no_tag_testing

Cirrus: Skip most tests on tag-push

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
 }