From 16acfd7edbdd27b921537b258807f28f38f6bd7a Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Nov 2024 10:09:39 -0700 Subject: [PATCH] Revert "cirrus: test only on f40/rawhide" This reverts commit d03e8ffc56e4337d6b14e9b4d0569555b0aadb3d. Signed-off-by: Ed Santiago (cherry picked from commit d7700690626a6daeb9767985f44bb26a8d70f30f) Signed-off-by: Paul Holzinger --- .cirrus.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 308dd67778..107008e70b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -146,11 +146,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 f39 contains a to old golang - # Once we bump our images to f41/40 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: @@ -665,9 +663,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