File tree Expand file tree Collapse file tree 1 file changed +13
-6
lines changed Expand file tree Collapse file tree 1 file changed +13
-6
lines changed Original file line number Diff line number Diff line change @@ -155,11 +155,9 @@ build_task:
155
155
VM_IMAGE_NAME : ${FEDORA_CACHE_IMAGE_NAME}
156
156
CTR_FQIN : ${FEDORA_CONTAINER_FQIN}
157
157
- 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}
163
161
CI_DESIRED_DATABASE : boltdb
164
162
CI_DESIRED_STORAGE : vfs
165
163
- env :
@@ -724,9 +722,18 @@ container_integration_test_task:
724
722
# Docs: ./contrib/cirrus/CIModes.md
725
723
only_if : *only_if_int_test
726
724
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
727
735
gce_instance : *fastvm
728
736
env :
729
- << : *stdenvars
730
737
TEST_FLAVOR : int
731
738
TEST_ENVIRON : container
732
739
clone_script : *get_gosrc
You can’t perform that action at this time.
0 commit comments