Skip to content

CI VMs: bump to f41 #24485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 6, 2024
Merged

CI VMs: bump to f41 #24485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba5ce49
test f41 VMs
edsantiago Nov 6, 2024
d770069
Revert "cirrus: test only on f40/rawhide"
edsantiago Nov 6, 2024
0e66a79
Reapply "CI: test nftables driver on fedora"
edsantiago Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions contrib/cirrus/setup_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down