From b0df21edef5aa300b0e04a952d2fe0664894b1c4 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 16 Apr 2025 13:33:21 +0200 Subject: [PATCH 1/2] New images 2025-04-16 https://github.com/containers/automation_images/pull/404 Signed-off-by: Paul Holzinger --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d1869d68a5..dbf0532ba3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -24,14 +24,14 @@ env: #### #### Cache-image names to test with (double-quotes around names are critical) #### - FEDORA_NAME: "fedora-41" + FEDORA_NAME: "fedora-42" FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" - PRIOR_FEDORA_NAME: "fedora-40" + PRIOR_FEDORA_NAME: "fedora-41" RAWHIDE_NAME: "rawhide" DEBIAN_NAME: "debian-13" # Image identifiers - IMAGE_SUFFIX: "c20250324t111922z-f41f40d13" + IMAGE_SUFFIX: "c20250422t130822z-f42f41d13" # EC2 images FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" From 9a0f013f0a1d547bf29a7ce76bff8bef2b10b7b6 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 16 Apr 2025 13:33:56 +0200 Subject: [PATCH 2/2] Revert "cirrus: test only on f41/rawhide" This reverts commit 05fc9d2d6b4c81d9f19272bea9d319c5c36cfe02. Images use fedora f42 now. Signed-off-by: Paul Holzinger --- .cirrus.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index dbf0532ba3..828b395c8c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -155,11 +155,9 @@ build_task: VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} CTR_FQIN: ${FEDORA_CONTAINER_FQIN} - env: - # Note, this is changed to FEDORA_NAME temporarily as f40 contains a to old golang - # Once we bump our images to f42/41 this must be turned back to PRIOR_FEDORA_NAME - DISTRO_NV: ${FEDORA_NAME} - VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} - CTR_FQIN: ${FEDORA_CONTAINER_FQIN} + DISTRO_NV: ${PRIOR_FEDORA_NAME} + VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} + CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} CI_DESIRED_DATABASE: boltdb CI_DESIRED_STORAGE: vfs - env: @@ -724,9 +722,18 @@ container_integration_test_task: # Docs: ./contrib/cirrus/CIModes.md only_if: *only_if_int_test depends_on: *build + matrix: &fedora_vm_axis + - env: + DISTRO_NV: ${FEDORA_NAME} + VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} + CTR_FQIN: ${FEDORA_CONTAINER_FQIN} + - env: + DISTRO_NV: ${PRIOR_FEDORA_NAME} + VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} + CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} + CI_DESIRED_DATABASE: boltdb gce_instance: *fastvm env: - <<: *stdenvars TEST_FLAVOR: int TEST_ENVIRON: container clone_script: *get_gosrc