Skip to content
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

Jump to bottom

tests/upgrade: make more robust, handle cgroups v1 #3142

Merged
merged 3 commits into from
Sep 5, 2024
Merged

tests/upgrade: make more robust, handle cgroups v1 #3142

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
02da51a
tests/upgrade: just reboot if any configuration changes were needed
dustymabe Sep 4, 2024
c9c4341
tests/upgrade: add workaround for cgroups v1 origins
dustymabe Sep 5, 2024
c3b127e
Update cgroups warning with new information
dustymabe Sep 5, 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
9 changes: 4 additions & 5 deletions overlay.d/15fcos/usr/libexec/coreos-check-cgroups-version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ motd_path=/run/motd.d/30_cgroupsv1_warning.motd
cat << EOF > "${motd_path}"
${warn}
##########################################################################
WARNING: This system is using cgroups v1. For increased reliability
it is strongly recommended to migrate this system and your workloads
to use cgroups v2. A future version of Podman will also drop support
for cgroups v1. For instructions on how to adjust kernel arguments
to use cgroups v2, see:
WARNING: This system is using cgroups v1. In Fedora 41 this system will
no longer continue to boot. It is strongly recommended to migrate this
system and your workloads to use cgroups v2. For instructions on how to
adjust kernel arguments to use cgroups v2, see:
https://docs.fedoraproject.org/en-US/fedora-coreos/kernel-args/

To disable this warning, use:
Expand Down
59 changes: 39 additions & 20 deletions tests/kola/upgrade/extended/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ set -eux -o pipefail

. /etc/os-release # for $VERSION_ID

need_zincati_restart='false'
need_restart='false'

# delete the disabling of updates that was done by the test framework
if [ -f /etc/zincati/config.d/90-disable-auto-updates.toml ]; then
rm -f /etc/zincati/config.d/90-disable-auto-updates.toml
need_zincati_restart='true'
need_restart='true'
fi

# Early `next` releases before [1] had auto-updates disabled too. Let's
# drop that config if it exists.
# [1] https://github.com/coreos/fedora-coreos-config/commit/99eab318998441760cca224544fc713651f7a16d
if [ -f /etc/zincati/config.d/90-disable-on-non-production-stream.toml ]; then
rm -f /etc/zincati/config.d/90-disable-on-non-production-stream.toml
need_zincati_restart='true'
need_restart='true'
fi

get_booted_deployment_json() {
Expand Down Expand Up @@ -107,35 +107,51 @@ grab-gpg-keys() {
# https://github.com/coreos/fedora-coreos-tracker/issues/749
max_version=${target_version:0:2} # i.e. 36, 37, 38, etc..
for ver in $(seq $VERSION_ID $max_version); do
test -e "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${ver}-primary" && continue
curl -L "https://src.fedoraproject.org/rpms/fedora-repos/raw/rawhide/f/RPM-GPG-KEY-fedora-${ver}-primary" | \
sudo tee "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${ver}-primary"
sudo chcon -v --reference="/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${VERSION_ID}-primary" "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${ver}-primary"
file="/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${ver}-primary"
if [ ! -e $file ]; then
need_restart='true'
curl -L "https://src.fedoraproject.org/rpms/fedora-repos/raw/rawhide/f/RPM-GPG-KEY-fedora-${ver}-primary" | \
sudo tee $file
sudo chcon -v --reference="/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${VERSION_ID}-primary" $file
fi
done
# restart Zincati in case the process had been kicked off earlier
# than this script ran.
need_zincati_restart='true'
}

fix-update-url() {
# We switched to non stg URL in zincati v0.0.10 [1]. For older clients
# we need to update the runtime configuration of zincati to get past the problem.
# [1] https://github.com/coreos/zincati/commit/1d73801ccd015cdce89f082cb1eeb9b4b8335760
cat <<'EOF' > /run/zincati/config.d/50-fedora-coreos-cincinnati.toml
file='/etc/zincati/config.d/50-fedora-coreos-cincinnati.toml'
if [ ! -e $file ]; then
need_restart='true'
cat > $file <<'EOF'
[cincinnati]
base_url= "https://updates.coreos.fedoraproject.org"
EOF
need_zincati_restart='true'
fi
}

fix-allow-downgrade() {
# Older FCOS will complain about an upgrade target being 'chronologically older than current'
# This is documented in https://github.com/coreos/fedora-coreos-tracker/issues/481
# We can workaround the problem via a config dropin:
cat <<'EOF' > /run/zincati/config.d/99-fedora-coreos-allow-downgrade.toml
file='/etc/zincati/config.d/99-fedora-coreos-allow-downgrade.toml'
if [ ! -e $file ]; then
need_restart='true'
cat > $file <<'EOF'
updates.allow_downgrade = true
EOF
need_zincati_restart='true'
fi
}

move-to-cgroups-v2() {
# When upgrading to latest F41+ the system won't even boot on cgroups v1
if grep -q unified_cgroup_hierarchy /proc/cmdline; then
systemctl stop zincati
rpm-ostree cancel
rpm-ostree kargs --delete=systemd.unified_cgroup_hierarchy
need_restart='true'
fi
}

ok "Reached version: $version"
Expand Down Expand Up @@ -173,16 +189,19 @@ fi
case "$stream" in
'next')
verlt $version '35.20211119.1.0' && grab-gpg-keys
verlt $version '34.20210413.1.0' && move-to-cgroups-v2
verlt $version '32.20200517.1.0' && fix-allow-downgrade
verlt $version '32.20200505.1.0' && fix-update-url
;;
'testing')
verlt $version '35.20211119.2.0' && grab-gpg-keys
verlt $version '34.20210529.2.0' && move-to-cgroups-v2
verlt $version '31.20200517.2.0' && fix-allow-downgrade
verlt $version '31.20200505.2.0' && fix-update-url
;;
'stable')
verlt $version '35.20211119.3.0' && grab-gpg-keys
verlt $version '34.20210529.3.0' && move-to-cgroups-v2
verlt $version '31.20200517.3.0' && fix-allow-downgrade
verlt $version '31.20200505.3.0' && fix-update-url
;;
Expand All @@ -195,14 +214,14 @@ esac
if vereq $version $last_release; then
systemctl stop zincati
rpm-ostree rebase "fedora-compose:fedora/$(arch)/coreos/${target_stream}" $target_version
/tmp/autopkgtest-reboot reboot # execute the reboot
/tmp/autopkgtest-reboot $version # execute the reboot
sleep infinity
fi

# Restart Zincati if configuration was changed
if [ "${need_zincati_restart}" == "true" ]; then
rpm-ostree cancel # in case anything was already in progress
systemctl restart zincati
# Restart if configuration was changed
if [ "${need_restart}" == "true" ]; then
/tmp/autopkgtest-reboot setup
sleep infinity
fi

# Watch the Zincati logs to see if it got a lead on a new update.
Expand All @@ -219,7 +238,7 @@ set -o pipefail

# OK update has been initiated, prepare for reboot and loop to show
# status of zincati and rpm-ostreed
/tmp/autopkgtest-reboot-prepare reboot
/tmp/autopkgtest-reboot-prepare $version
while true; do
sleep 20
systemctl status rpm-ostreed zincati --lines=0
Expand Down
Loading