From 0e4e5cf99083ac7ee3f59a0f689d58423cb172c5 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 10 Jan 2022 14:14:52 -0500 Subject: Revert "Cirrus: Temp. ignore gitlab task failures" Ref: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/28766 This reverts commit 8cb93ac1035b8966b03a87ea58366fe9f3fc7887. Signed-off-by: Chris Evich --- .cirrus.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3dfbff11b..5bb8b17fc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -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 -- cgit v1.2.3-54-g00ecf From 799078216bce860ebcc239c7952ce6cd7491996b Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 10 Jan 2022 14:25:42 -0500 Subject: Cirrus: Freshen VM images Specifically, this brings in `crun 1.4-1` allowing removal of a temporary workaround. Ref: https://github.com/containers/podman/pull/12759 Signed-off-by: Chris Evich --- .cirrus.yml | 2 +- contrib/cirrus/setup_environment.sh | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5bb8b17fc..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}" 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" -- cgit v1.2.3-54-g00ecf