cirrus: test only on f40/rawhide

We want to update to golang 1.22 but f39 only ships 1.21. This means we
can no longer build on f39 once the update is done. Given we do not ship
podman 5.0 on f39 anyway this is not a problem.

So drop the f39 tasks but given we use them to test different db/storage
drivers we cannot just remove them. Instead we now test f40 twice with
the different db/storage drivers to ensure we keep full coverage.

It do however drop it from the container int task. I really do not see
the value there to test a different db backend as this doesn't depend on
anything in the container.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>

.cirrus.yml

@@ -146,9 +146,11 @@ build_task:
               VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
               CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
         - env:
-              DISTRO_NV: ${PRIOR_FEDORA_NAME}
+              # Note, this is changed to FEDORA_NAME temporarily as f39 contains a to old golang
-              VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
+              # Once we bump our images to f41/40 this must be turned back to PRIOR_FEDORA_NAME
-              CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
+              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:
@@ -655,18 +657,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