Skip to content

Commit

Permalink
Merge pull request #8951 from edsantiago/fix_dev_diagnostic
Browse files Browse the repository at this point in the history
CI: fix broken diagnostic message for -dev check
  • Loading branch information
openshift-merge-robot authored Jan 13, 2021
2 parents 2b0cf77 + 34304df commit b2b1423
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions contrib/cirrus/runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit b2b1423

Please sign in to comment.