From fe0d768444d3de18f8e49785f6d9389d7d370080 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 28 Oct 2020 12:04:24 -0400
Subject: [PATCH 1/2] tests/kola/misc-ro: backport kdump.service test

From https://github.com/coreos/fedora-coreos-config/pull/716.
---
 tests/kola/misc-ro/misc-ro.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/kola/misc-ro/misc-ro.sh b/tests/kola/misc-ro/misc-ro.sh
index 6a31ed51..5822ef5e 100755
--- a/tests/kola/misc-ro/misc-ro.sh
+++ b/tests/kola/misc-ro/misc-ro.sh
@@ -50,6 +50,13 @@ if [ "$(systemctl is-enabled afterburn-sshkeys@.service)" = enabled ]; then
 fi
 echo "ok afterburn-sshkeys@ is disabled"
 
+# Make sure that kdump didn't start (it's either disabled, or enabled but
+# conditional on crashkernel= karg, which we don't bake).
+if ! systemctl show -p ActiveState kdump.service | grep -q ActiveState=inactive; then
+    fatal "Unit kdump.service shouldn't be active"
+fi
+echo "ok kdump.service not active"
+
 test -d /etc/yum.repos.d
 echo "ok have /etc/yum.repos.d"
 

From cf3948d142720845dd6460f7ce91361dacd4e164 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 28 Oct 2020 12:06:46 -0400
Subject: [PATCH 2/2] tests/kola/luks: use stable spec for LUKS test

Ignition 2.7.0 which stabilized it is in RHCOS 4.7 now.
---
 tests/kola/luks/ignition/config.ign | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/kola/luks/ignition/config.ign b/tests/kola/luks/ignition/config.ign
index a4062af6..bf48caf8 100644
--- a/tests/kola/luks/ignition/config.ign
+++ b/tests/kola/luks/ignition/config.ign
@@ -1,6 +1,6 @@
 {
     "ignition": {
-        "version": "3.2.0-experimental"
+        "version": "3.2.0"
     },
     "storage": {
         "luks": [