wip

tests/integration/image-install-upgrade.sh

@@ -95,7 +95,7 @@ RUN cat <<EOF >> /usr/lib/bootc/install/00-mitigations.toml
 [install.filesystem.root]
 type = "xfs"
 [install]
-kargs = ["mitigations=on,nosmt"]
+kargs = ["console=tty0"]
 EOF
 REALEOF
 
@@ -200,7 +200,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=on" \
     playbooks/check-system.yaml
 
 greenprint "Create upgrade Containerfile"
@@ -209,7 +209,7 @@ FROM "$TEST_IMAGE_URL"
 RUN dnf -y install wget && \
     dnf -y clean all
 RUN cat <<EOF >> /usr/lib/bootc/kargs.d/01-console.toml
-kargs = ["systemd.unified_cgroup_hierarchy=0"]
+kargs = ["systemd.unified_cgroup_hierarchy=0", "panic=1"]
 EOF
 REALEOF
 
@@ -230,7 +230,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=0,panic=1" \
     playbooks/check-system.yaml
 
 greenprint "Create second upgrade Containerfile to test kargs delta"
@@ -239,7 +239,7 @@ FROM "$TEST_IMAGE_URL"
 RUN dnf -y install wget && \
     dnf -y clean all
 RUN cat <<EOF >> /usr/lib/bootc/kargs.d/01-console.toml
-kargs = ["systemd.unified_cgroup_hierarchy=1"]
+kargs = ["systemd.unified_cgroup_hierarchy=1", "panic=0"]
 EOF
 REALEOF
 
@@ -255,7 +255,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=1,panic=0" \
     playbooks/check-system.yaml
 
 greenprint "Rollback $TEST_OS system"