Revert "cirrus: test only on f41/rawhide"

This reverts commit 05fc9d2d6b4c81d9f19272bea9d319c5c36cfe02.

Images use fedora f42 now.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-04-16 13:33:56 +02:00
parent b0df21edef
commit 9a0f013f0a

View File

@ -155,11 +155,9 @@ build_task:
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
- env: - env:
# Note, this is changed to FEDORA_NAME temporarily as f40 contains a to old golang DISTRO_NV: ${PRIOR_FEDORA_NAME}
# Once we bump our images to f42/41 this must be turned back to PRIOR_FEDORA_NAME VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
DISTRO_NV: ${FEDORA_NAME} CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
CI_DESIRED_DATABASE: boltdb CI_DESIRED_DATABASE: boltdb
CI_DESIRED_STORAGE: vfs CI_DESIRED_STORAGE: vfs
- env: - env:
@ -724,9 +722,18 @@ container_integration_test_task:
# Docs: ./contrib/cirrus/CIModes.md # Docs: ./contrib/cirrus/CIModes.md
only_if: *only_if_int_test only_if: *only_if_int_test
depends_on: *build 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 gce_instance: *fastvm
env: env:
<<: *stdenvars
TEST_FLAVOR: int TEST_FLAVOR: int
TEST_ENVIRON: container TEST_ENVIRON: container
clone_script: *get_gosrc clone_script: *get_gosrc