containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI: fix broken diagnostic message for -dev check 

There's a CI check for the presence of "-dev" in podman-info output
(it should not appear). This test is unlikely to fail, but if it
ever does, the diagnostic output is unhelpful. This makes it helpful.

Tested via:

    $ ln -s /bin/echo ~/bin/msg
    $ ln -s /bin/echo ~/bin/die
    $ TEST_FLAVOR=release ./contrib/cirrus/runner.sh
    ...
    Releases must never contain '-dev' in output of 'podman info' ( buildahVersion: 1.19.0-dev
      Version: 3.0.0-dev)

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2021-01-12 11:46:23 -07:00
parent 9473dda87c
commit 34304df281
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/cirrus/runner.sh
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() {