From b4a7ad721b099c05064027d2a81c0c97b0e1463a Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Mon, 6 May 2024 19:30:28 +0200
Subject: [PATCH] test: update config to match new rules

Unattended + kickstart.contents is no longer allowed, so set unattended
to false.
---
 test/config-map.json                          |  2 +-
 .../interactive-iso-userkickstart.json        | 22 +++++++++++++
 .../configs/unattended-iso-userkickstart.json | 31 -------------------
 3 files changed, 23 insertions(+), 32 deletions(-)
 create mode 100644 test/configs/interactive-iso-userkickstart.json
 delete mode 100644 test/configs/unattended-iso-userkickstart.json

diff --git a/test/config-map.json b/test/config-map.json
index ef97a7b988..295a52d776 100644
--- a/test/config-map.json
+++ b/test/config-map.json
@@ -250,7 +250,7 @@
       "image-installer"
     ]
   },
-  "./configs/unattended-iso-userkickstart.json": {
+  "./configs/interactive-iso-userkickstart.json": {
     "distros": [
       "rhel-9.4"
     ],
diff --git a/test/configs/interactive-iso-userkickstart.json b/test/configs/interactive-iso-userkickstart.json
new file mode 100644
index 0000000000..55477cc0f9
--- /dev/null
+++ b/test/configs/interactive-iso-userkickstart.json
@@ -0,0 +1,22 @@
+{
+  "name": "interactive-iso-userkickstart",
+  "blueprint": {
+    "customizations": {
+      "locale": {
+        "languages": [
+          "en_GB.UTF-8"
+        ],
+        "keyboard": "uk"
+      },
+      "timezone": {
+        "timezone": "Europe/Berlin"
+      },
+      "installer": {
+        "unattended": false,
+        "kickstart": {
+          "contents": "%post\n\necho \"=== Custom user kickstart ===\"\n\necho -e \"%sudo\\tALL=(ALL)\\tNOPASSWD: ALL\" > \"/etc/sudoers.d/%sudo\"\nchmod 0440 /etc/sudoers.d/%sudo\necho -e \"%wheel\\tALL=(ALL)\\tNOPASSWD: ALL\" > \"/etc/sudoers.d/%wheel\"\nchmod 0440 /etc/sudoers.d/%wheel\nrestorecon -rvF /etc/sudoers.d\n%end\n"
+        }
+      }
+    }
+  }
+}
diff --git a/test/configs/unattended-iso-userkickstart.json b/test/configs/unattended-iso-userkickstart.json
deleted file mode 100644
index c165c8a3a3..0000000000
--- a/test/configs/unattended-iso-userkickstart.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "unattended-iso-userkickstart",
-  "blueprint": {
-    "customizations": {
-      "user": [
-        {
-          "groups": [
-            "wheel"
-          ],
-          "key": "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNebAh6SjpAn8wB53K4695cGnHGuCtl4RdaX3futZgJUultHyzeYHnzMO7d4++qnRL+Rworew62LKP560uvtncc= github.com/osbuild/images",
-          "name": "osbuild"
-        }
-      ],
-      "locale": {
-        "languages": [
-          "en_GB.UTF-8"
-        ],
-        "keyboard": "uk"
-      },
-      "timezone": {
-        "timezone": "Europe/Berlin"
-      },
-      "installer": {
-        "unattended": true,
-        "kickstart": {
-          "contents": "%post\necho -e \"%sudo\\tALL=(ALL)\\tNOPASSWD: ALL\" > \"/etc/sudoers.d/%sudo\"\nchmod 0440 /etc/sudoers.d/%sudo\necho -e \"%wheel\\tALL=(ALL)\\tNOPASSWD: ALL\" > \"/etc/sudoers.d/%wheel\"\nchmod 0440 /etc/sudoers.d/%wheel\nrestorecon -rvF /etc/sudoers.d\n%end\n"
-        }
-      }
-    }
-  }
-}