Skip to content

Commit 9a0f013

Browse files
committed
Revert "cirrus: test only on f41/rawhide"
This reverts commit 05fc9d2. Images use fedora f42 now. Signed-off-by: Paul Holzinger <[email protected]>
1 parent b0df21e commit 9a0f013

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

.cirrus.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,9 @@ build_task:
155155
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
156156
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
157157
- env:
158-
# Note, this is changed to FEDORA_NAME temporarily as f40 contains a to old golang
159-
# Once we bump our images to f42/41 this must be turned back to PRIOR_FEDORA_NAME
160-
DISTRO_NV: ${FEDORA_NAME}
161-
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
162-
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
158+
DISTRO_NV: ${PRIOR_FEDORA_NAME}
159+
VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
160+
CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
163161
CI_DESIRED_DATABASE: boltdb
164162
CI_DESIRED_STORAGE: vfs
165163
- env:
@@ -724,9 +722,18 @@ container_integration_test_task:
724722
# Docs: ./contrib/cirrus/CIModes.md
725723
only_if: *only_if_int_test
726724
depends_on: *build
725+
matrix: &fedora_vm_axis
726+
- env:
727+
DISTRO_NV: ${FEDORA_NAME}
728+
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
729+
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
730+
- env:
731+
DISTRO_NV: ${PRIOR_FEDORA_NAME}
732+
VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
733+
CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
734+
CI_DESIRED_DATABASE: boltdb
727735
gce_instance: *fastvm
728736
env:
729-
<<: *stdenvars
730737
TEST_FLAVOR: int
731738
TEST_ENVIRON: container
732739
clone_script: *get_gosrc

0 commit comments

Comments
 (0)