Merge pull request #8951 from edsantiago/fix_dev_diagnostic

CI: fix broken diagnostic message for -dev check
This commit is contained in:
OpenShift Merge Robot
2021-01-13 14:18:17 -05:00
committed by GitHub

View File

@ -203,16 +203,18 @@ function _run_altbuild() {
function _run_release() { function _run_release() {
# TODO: These tests should come from code external to the podman repo. # 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 # 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." msg "Checking podman release (or potential release) criteria."
info_output=$(bin/podman info 2>&1) dev=$(bin/podman info |& grep -- -dev)
if grep -q -- '-dev'<<<"$info_output"; then if [[ -n "$dev" ]]; then
die "Releases must never contain '-dev' in output of 'podman info': die "Releases must never contain '-dev' in output of 'podman info' ($dev)"
$info_output"
fi fi
msg "All OK"
} }
logformatter() { logformatter() {