From 65e8e5578dacdbfa0ad4c45ae1595451868d4675 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 2 Feb 2022 13:02:15 -0500
Subject: [PATCH] tests: ignition.kargs.basic: rework test

- Add description
- Convert Ignition to Butane
- Use ok/fatal from commonlib.sh
---
 tests/kola/ignition/kargs/basic/config.bu         |  7 +++++++
 tests/kola/ignition/kargs/basic/config.ign        |  9 ---------
 tests/kola/ignition/kargs/basic/data/commonlib.sh |  1 +
 tests/kola/ignition/kargs/basic/test.sh           | 10 ++--------
 4 files changed, 10 insertions(+), 17 deletions(-)
 create mode 100644 tests/kola/ignition/kargs/basic/config.bu
 delete mode 100644 tests/kola/ignition/kargs/basic/config.ign
 create mode 120000 tests/kola/ignition/kargs/basic/data/commonlib.sh

diff --git a/tests/kola/ignition/kargs/basic/config.bu b/tests/kola/ignition/kargs/basic/config.bu
new file mode 100644
index 0000000000..9c5f82fb56
--- /dev/null
+++ b/tests/kola/ignition/kargs/basic/config.bu
@@ -0,0 +1,7 @@
+variant: fcos
+version: 1.4.0
+kernel_arguments:
+  should_exist:
+    - foobar
+  should_not_exist:
+    - mitigations=auto,nosmt
diff --git a/tests/kola/ignition/kargs/basic/config.ign b/tests/kola/ignition/kargs/basic/config.ign
deleted file mode 100644
index 00816dc153..0000000000
--- a/tests/kola/ignition/kargs/basic/config.ign
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ignition": {
-    "version": "3.3.0"
-  },
-  "kernelArguments": {
-    "shouldExist": ["foobar"],
-    "shouldNotExist": ["mitigations=auto,nosmt"]
-  }
-}
diff --git a/tests/kola/ignition/kargs/basic/data/commonlib.sh b/tests/kola/ignition/kargs/basic/data/commonlib.sh
new file mode 120000
index 0000000000..7028449b11
--- /dev/null
+++ b/tests/kola/ignition/kargs/basic/data/commonlib.sh
@@ -0,0 +1 @@
+../../../../data/commonlib.sh
\ No newline at end of file
diff --git a/tests/kola/ignition/kargs/basic/test.sh b/tests/kola/ignition/kargs/basic/test.sh
index a7535254f8..5e39e781d5 100755
--- a/tests/kola/ignition/kargs/basic/test.sh
+++ b/tests/kola/ignition/kargs/basic/test.sh
@@ -1,14 +1,8 @@
 #!/bin/bash
 set -xeuo pipefail
+# This test runs on all platforms and verifies Ignition kernel argument setting.
 
-ok() {
-    echo "ok" "$@"
-}
-
-fatal() {
-    echo "$@" >&2
-    exit 1
-}
+. $KOLA_EXT_DATA/commonlib.sh
 
 if ! grep foobar /proc/cmdline; then
     fatal "missing foobar in kernel cmdline"