From 03b53d3d59d7f35ad429c6d6693d3c69d9116092 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 19 Mar 2025 11:05:17 -0400 Subject: [PATCH] Partially revert f8bca0f The Fedora-37 CI VMs used prior to f8bca0f closely matched RHEL-8.8 which is the intended destination of this v4.4.1-rhel release branch. Importantly this change, along with one or more future commits (53a8ef8..b9110a1) lead to downstream build failures on RHEL 8.8, and reproduce using the original Fedora-37 CI VMs. In other words, leaving the F37 CI VMs in place would have allowed these failures to be caught during upstream rather than downstream testing. Signed-off-by: Chris Evich --- .cirrus.yml | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1858a6a5f5..5abc5b64aa 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -26,27 +26,17 @@ env: #### #### Cache-image names to test with (double-quotes around names are critical) #### - FEDORA_NAME: "fedora-41" + FEDORA_NAME: "fedora-37" FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" - PRIOR_FEDORA_NAME: "fedora-40" - RAWHIDE_NAME: "rawhide" - DEBIAN_NAME: "debian-13" # Image identifiers - IMAGE_SUFFIX: "c20250107t132430z-f41f40d13" + IMAGE_SUFFIX: "c6447802205601792" - # EC2 images - FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}" # GCP Images FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" - PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" - RAWHIDE_CACHE_IMAGE_NAME: "rawhide-${IMAGE_SUFFIX}" - DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}" # Container FQIN's FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" - PRIOR_FEDORA_CONTAINER_FQIN: "quay.io/libpod/prior-fedora_podman:${IMAGE_SUFFIX}" - WINDOWS_AMI: "win-server-wsl-${IMAGE_SUFFIX}" #### #### Control variables that determine what to run and how to run it. #### N/B: Required ALL of these are set for every single task. @@ -188,15 +178,8 @@ meta_task: image: quay.io/libpod/imgts:latest env: # Space-separated list of images used by this repository state - IMGNAMES: >- - ${FEDORA_CACHE_IMAGE_NAME} - ${PRIOR_FEDORA_CACHE_IMAGE_NAME} - ${RAWHIDE_CACHE_IMAGE_NAME} - ${DEBIAN_CACHE_IMAGE_NAME} - EC2IMGNAMES: >- - ${FEDORA_AARCH64_AMI} - ${FEDORA_AMI} - ${WINDOWS_AMI} + IMGNAMES: ${FEDORA_CACHE_IMAGE_NAME} + EC2IMGNAMES: ${FEDORA_AARCH64_AMI} BUILDID: "${CIRRUS_BUILD_ID}" REPOREF: "${CIRRUS_REPO_NAME}" AWSINI: ENCRYPTED[21b2db557171b11eb5abdbccae593f48c9caeba86dfcc4d4ff109edee9b4656ab6720a110dadfcd51e88cc59a71cc7af]