diff options
| -rw-r--r-- | .cirrus.yml | 10 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 6 | ||||
| -rw-r--r-- | test/system/010-images.bats | 4 | ||||
| -rw-r--r-- | test/system/035-logs.bats | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 3dfbff11b..c33ed9c0c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,7 +29,7 @@ env: UBUNTU_NAME: "ubuntu-2110" # Google-cloud VM Images - IMAGE_SUFFIX: "c6015869890330624" + IMAGE_SUFFIX: "c6454758209748992" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" @@ -612,10 +612,10 @@ rootless_gitlab_test_task: alias: rootless_gitlab_test skip: *tags only_if: *not_docs - # Test temporarily ignored due to failure on/around 7-10th Dec. 2021 - # Appears related to https://gitlab.com/gitlab-org/gitlab-runner/-/issues/28732 - # Log: https://cirrus-ci.com/task/5708221852680192?logs=setup#L433 - allow_failures: $CI == $CI + # Community-maintained downstream test may fail unexpectedly. + # Ref. repository: https://gitlab.com/gitlab-org/gitlab-runner + # If necessary, uncomment the next line and file issue(s) with details. + # allow_failures: $CI == $CI depends_on: - rootless_integration_test gce_instance: *standardvm diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index ee80a209c..8f535c7e7 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -118,12 +118,6 @@ fi case "$OS_RELEASE_ID" in ubuntu) ;; fedora) - # Force a crun version that has this fix: https://github.com/containers/crun/pull/819 - # FIXME: Remove once a fixed crun made its way into Fedora - if test "$OS_RELEASE_VER" == "35"; then - yum upgrade -y crun - fi - if ((CONTAINER==0)); then # All SELinux distros need this for systemd-in-a-container msg "Enabling container_manage_cgroup" diff --git a/test/system/010-images.bats b/test/system/010-images.bats index 201418620..ebd71450f 100644 --- a/test/system/010-images.bats +++ b/test/system/010-images.bats @@ -272,6 +272,10 @@ Deleted: $pauseID" "infra images gets removed as well" is "$output" "" run_podman create --pod new:$pname $IMAGE + # Clean up + run_podman rm "${lines[-1]}" + run_podman pod rm -a + run_podman rmi $pauseImage } @test "podman images - rmi -f can remove infra images" { diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats index 3caf97a22..db50c8f8c 100644 --- a/test/system/035-logs.bats +++ b/test/system/035-logs.bats @@ -90,14 +90,16 @@ ${cid[0]} d" "Sequential output from logs" } function _log_test_restarted() { - run_podman run --log-driver=$1 --name logtest $IMAGE sh -c 'start=0; if test -s log; then start=`tail -n 1 log`; fi; seq `expr $start + 1` `expr $start + 10` | tee -a log' + local driver=$1 + local events_backend=$(_additional_events_backend $driver) + run_podman run --log-driver=$driver ${events_backend} --name logtest $IMAGE sh -c 'start=0; if test -s log; then start=`tail -n 1 log`; fi; seq `expr $start + 1` `expr $start + 10` | tee -a log' # FIXME: #9597 # run/start is flaking for remote so let's wait for the container condition # to stop wasting energy until the root cause gets fixed. run_podman container wait --condition=exited logtest - run_podman start -a logtest + run_podman ${events_backend} start -a logtest logfile=$(mktemp -p ${PODMAN_TMPDIR} logfileXXXXXXXX) - $PODMAN $_PODMAN_TEST_OPTS logs -f logtest > $logfile + $PODMAN $_PODMAN_TEST_OPTS ${events_backend} logs -f logtest > $logfile expected=$(mktemp -p ${PODMAN_TMPDIR} expectedXXXXXXXX) seq 1 20 > $expected diff -u ${expected} ${logfile} |