From ba5ce49c10efa77dea0113f588fc400373755475 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Nov 2024 08:22:09 -0700 Subject: [PATCH 1/3] test f41 VMs Signed-off-by: Ed Santiago --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f785857371..308dd67778 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -26,14 +26,14 @@ env: #### #### Cache-image names to test with (double-quotes around names are critical) #### - FEDORA_NAME: "fedora-40" + FEDORA_NAME: "fedora-41" FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" - PRIOR_FEDORA_NAME: "fedora-39" + PRIOR_FEDORA_NAME: "fedora-40" RAWHIDE_NAME: "rawhide" DEBIAN_NAME: "debian-13" # Image identifiers - IMAGE_SUFFIX: "c20241016t144444z-f40f39d13" + IMAGE_SUFFIX: "c20241106t163000z-f41f40d13" # EC2 images FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" From d7700690626a6daeb9767985f44bb26a8d70f30f Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Nov 2024 10:09:39 -0700 Subject: [PATCH 2/3] Revert "cirrus: test only on f40/rawhide" This reverts commit d03e8ffc56e4337d6b14e9b4d0569555b0aadb3d. Signed-off-by: Ed Santiago --- .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 From 0e66a793bc416f76be15a603d1b2d8bd336f3865 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Nov 2024 10:58:34 -0700 Subject: [PATCH 3/3] Reapply "CI: test nftables driver on fedora" Temporary, until we get CI VMs with kernel 6.11.6. I've lost track of where this is being discussed. This reverts commit 7f836df303b92a606c17a336911bba206e9fea68. Signed-off-by: Ed Santiago --- contrib/cirrus/setup_environment.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 2314f575b0..ac4fa749a3 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -147,6 +147,11 @@ case "$OS_RELEASE_ID" in msg "Enabling container_manage_cgroup" showrun setsebool container_manage_cgroup true fi + + # Test nftables driver, https://fedoraproject.org/wiki/Changes/NetavarkNftablesDefault + # We can drop this once this implemented and pushed into fedora stable. We cannot test it on + # debian because the netavark version there is way to old for nftables support. + printf "[network]\nfirewall_driver=\"nftables\"\n" > /etc/containers/containers.conf.d/90-nftables.conf ;; *) die_unknown OS_RELEASE_ID esac