From 05fc9d2d6b4c81d9f19272bea9d319c5c36cfe02 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 11 Mar 2025 16:51:36 +0100 Subject: [PATCH] cirrus: test only on f41/rawhide Like commit d03e8ffc56, we need to bump to go 1.23 to get some dependency updates for CVE fixes. Thus it will no longer build/test on F40, however F40 might get rebased to go 1.23 soon then we can revert this. Signed-off-by: Paul Holzinger --- .cirrus.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9bf8737112..00046172e3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -149,9 +149,11 @@ build_task: 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} + # 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} CI_DESIRED_DATABASE: boltdb CI_DESIRED_STORAGE: vfs - env: @@ -666,18 +668,9 @@ 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