diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-13 14:18:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 14:18:17 -0500 |
| commit | b2b14235aa774b4bd4139a8ee97ced0117bbe628 (patch) | |
| tree | 0293d53bd5585f03d8abc8d84fd0cdff353927b4 /contrib/cirrus | |
| parent | 2b0cf7728d4cd59d19821a1324a8ac2dcd7d3cac (diff) | |
| parent | 34304df2815762fcdc29d7b09685e5122cbe0b3b (diff) | |
| download | podman-b2b14235aa774b4bd4139a8ee97ced0117bbe628.tar.gz podman-b2b14235aa774b4bd4139a8ee97ced0117bbe628.tar.bz2 podman-b2b14235aa774b4bd4139a8ee97ced0117bbe628.zip | |
Merge pull request #8951 from edsantiago/fix_dev_diagnostic
CI: fix broken diagnostic message for -dev check
Diffstat (limited to 'contrib/cirrus')
| -rwxr-xr-x | contrib/cirrus/runner.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 2f909876a..b0060163e 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -203,16 +203,18 @@ function _run_altbuild() { function _run_release() { # 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 + # to allow test-changes (and re-runs) in the case of a correctable test # flaw or flake at release tag-push time. For now, the test is here - # given it's simplicity. + # given its simplicity. + msg "podman info:" + bin/podman info 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" + dev=$(bin/podman info |& grep -- -dev) + if [[ -n "$dev" ]]; then + die "Releases must never contain '-dev' in output of 'podman info' ($dev)" fi + msg "All OK" } logformatter() { |