diff --git a/tests/integration/image-install-upgrade.sh b/tests/integration/image-install-upgrade.sh index b21988770..410e97f57 100755 --- a/tests/integration/image-install-upgrade.sh +++ b/tests/integration/image-install-upgrade.sh @@ -96,7 +96,7 @@ RUN cat <> /usr/lib/bootc/install/00-mitigations.toml [install.filesystem.root] type = "xfs" [install] -kargs = ["mitigations=on", "nosmt"] +kargs = ["mitigations=off"] EOF REALEOF @@ -201,7 +201,7 @@ ansible-playbook -v \ -e test_os="$TEST_OS" \ -e bootc_image="$TEST_IMAGE_URL" \ -e image_label_version_id="$REDHAT_VERSION_ID" \ - -e kargs="mitigations=on,nosmt" \ + -e kargs="mitigations=off" \ playbooks/check-system.yaml greenprint "Create upgrade Containerfile" @@ -211,7 +211,7 @@ RUN dnf -y install wget && \ dnf -y clean all RUN mkdir -p /usr/lib/bootc/kargs.d RUN cat <> /usr/lib/bootc/kargs.d/01-console.toml -kargs = ["systemd.unified_cgroup_hierarchy=0"] +kargs = ["systemd.unified_cgroup_hierarchy=1"] EOF REALEOF @@ -232,7 +232,7 @@ ansible-playbook -v \ -e bootc_image="$TEST_IMAGE_URL" \ -e image_label_version_id="$REDHAT_VERSION_ID" \ -e upgrade="true" \ - -e kargs="systemd.unified_cgroup_hierarchy=0" \ + -e kargs="systemd.unified_cgroup_hierarchy=1" \ playbooks/check-system.yaml greenprint "Create second upgrade Containerfile to test kargs delta" @@ -240,7 +240,7 @@ tee "$UPGRADE_CONTAINERFILE" > /dev/null << REALEOF FROM "$TEST_IMAGE_URL" RUN mkdir -p /usr/lib/bootc/kargs.d RUN cat <> /usr/lib/bootc/kargs.d/01-console.toml -kargs = ["systemd.unified_cgroup_hierarchy=1"] +kargs = ["systemd.unified_cgroup_hierarchy=0"] EOF REALEOF @@ -261,7 +261,7 @@ ansible-playbook -v \ -e bootc_image="$TEST_IMAGE_URL" \ -e image_label_version_id="$REDHAT_VERSION_ID" \ -e upgrade="true" \ - -e kargs="systemd.unified_cgroup_hierarchy=1" \ + -e kargs="systemd.unified_cgroup_hierarchy=0" \ playbooks/check-system.yaml greenprint "Rollback $TEST_OS system"