cirrus: minor cleanup and refactoring#3217

openshift-merge-robot merged 1 commit intocontainers:mastercontainers/podman:masterfrom

edsantiago:cirrus_cleanupedsantiago/libpod:cirrus_cleanupCopy head branch name to clipboard