From 67a8bef6eae5d12d1b8727f5bb50fad7cb33fc9c Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 19 Jan 2023 12:34:03 -0500 Subject: [PATCH] Cirrus: Fix c/image CI testing The containers/image CI setup reuses the runner script from this repo to execute the skopeo tests. However, an env. var. is being taken out of context in that environment, leading to failure. Fix this by hard-coding an image-name which will always be available in both environments. Signed-off-by: Chris Evich --- contrib/cirrus/runner.sh | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 3792a249..fb128ccb 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -115,19 +115,15 @@ _run_unit() { _podman_reset() { # Ensure we start with a clean-slate showrun podman system reset --force - # Don't pollute the CI environment - ( - source $CIRRUS_WORKING_DIR/systemtest/helpers.bash - # WARNING WARNING WARNING WARNING - # Without running a container, the system tests will inexplicably - # fail with obscure errors/warning messages. I have no idea why - # running a container after a `system reset` fixes/prevents the - # problem. The failures do not reproduce when tests are run manually. - # So unless or until /until somebody develops a better understanding, - # this fix is JFM. - # WARNING WARNING WARNING WARNING - showrun podman run -it --rm --entrypoint /bin/true $REGISTRY_FQIN - ) + # WARNING WARNING WARNING WARNING + # Without running a container, the system tests will inexplicably + # fail with obscure errors/warning messages. I have no idea why + # running a container after a `system reset` fixes/prevents the + # problem. The failures do not reproduce when tests are run manually. + # So unless or until /until somebody develops a better understanding, + # this fix is JFM - just fakking magic. + # WARNING WARNING WARNING WARNING + showrun podman run -it --rm --entrypoint /bin/true quay.io/libpod/alpine:latest } _run_integration() {