tests/kola: move initrd tests into a subdirectory

Clean up comments a bit and switch to YAML metadata.
HuijingHei · Oct 10, 2023 · d9e3cc4 · d9e3cc4
1 parent 5e6f2c6
commit d9e3cc4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/tests/kola/files/initrd/data/commonlib.sh b/tests/kola/files/initrd/data/commonlib.sh
@@ -0,0 +1 @@
+../../../data/commonlib.sh
diff --git a/tests/kola/files/dracut-executable → tests/kola/files/initrd/executables b/tests/kola/files/dracut-executable → tests/kola/files/initrd/executables
@@ -1,11 +1,14 @@
 #!/bin/bash
-# kola: { "exclusive": false }
+## kola:
+##   exclusive: false
+#
+# It's easy for dracut modules to accidentally ship scripts without +x set.
+# Check for those.
 
 set -xeuo pipefail
 
 . $KOLA_EXT_DATA/commonlib.sh
 
-# It's easy for dracut modules to accidentally ship scripts without +x set
 tmpd=$(mktemp -d)
 ( cd "${tmpd}" && lsinitrd --unpack /boot/ostree/*/init* )
 if find "${tmpd}/usr/"{bin,sbin,libexec} ! -perm -0111 | grep -v clevis-luks-common-functions; then

diff --git a/tests/kola/files/expected-initrd-files → tests/kola/files/initrd/expected-contents b/tests/kola/files/expected-initrd-files → tests/kola/files/initrd/expected-contents
@@ -1,9 +1,10 @@
 #!/bin/bash
-# kola: { "exclusive": false }
+## kola:
+##   exclusive: false
 
-# This test runs on both, FCOS&RHCOS. The initrd includes specific files which,
-# if omitted from the image will cause some failures with certain ingnition
-# configurations. This test doesnt assert the functionality of any files, it
+# This test runs on both FCOS & RHCOS. The initrd includes specific files which,
+# if omitted from the image, will cause some failures with certain Ignition
+# configs. This test doesn't assert the functionality of any files, it
 # simply gives a high level check to see if the files are available.
 # See https://github.com/coreos/fedora-coreos-config/issues/1775