tests/toolbox: adjust to be runnable on RHCOS

tests/kola/toolbox/config.bu

@@ -0,0 +1,17 @@
+variant: fcos
+version: 1.6.0
+storage:
+  files:
+    # Toolbox configuration for older streams using https://github.com/coreos/toolbox
+    # RHEL registry requires credentials - use quay.io registry and a Fedora image for testing
+    - path: /var/home/core/.toolboxrc
+      contents:
+        inline: |
+          REGISTRY=quay.io
+          IMAGE=fedora/fedora-toolbox:latest
+          TOOLBOX_NAME=fedora-toolbox-latest
+          AUTHFILE=/var/home/core/config.json
+    # Toolbox fails if the AUTHFILE does not exist, but we don't actually need credentials
+    - path: /var/home/core/config.json
+      contents:
+        inline: "{}"

tests/kola/toolbox/test.sh

@@ -1,52 +1,92 @@
 #!/bin/bash
 ## kola:
 ##   tags: "platform-independent needs-internet"
-##   # This test only runs on FCOS because RHCOS is missing the `machinectl` command.
-##   # Additionally, there are some distro specific choices made for this test that
-##   # should/could be adapted for RHCOS.
-##   # TODO-RHCOS: adapt test for RHCOS specifics or create separate RHCOS toolbox test
-##   distros: fcos
 ##   # Toolbox container is currently available only for x86_64 and aarch64 in Fedora
 ##   architectures: x86_64 aarch64
 ##   description: Make sure that basic toolbox functionality works (creating,
 ##     running commands, and removing).
 
-# Important note: Commands are run indirectly via calls to `machinectl shell`
-# to re-create the user environment needed for unprivileged podman
-# functionality. However, machinectl shell does not propagate the exit
-# code/status of the invoked shell process thus we need additionnal checks to
-# ensure that previous commands were successful.
-
 set -xeuo pipefail
 
 # shellcheck disable=SC1091
 . "$KOLA_EXT_DATA/commonlib.sh"
 
+# IMPORTANT: Commands are run indirectly via `su - core` to re-create the
+# user environment needed for unprivileged podman functionality.
+run_as_core() {
+    su - core -c "$(printf '%q ' "$@")"
+}
+
+# Functions for testing basic functionality - overridden depending on toolbox being used
+toolbox_create() {
+    run_as_core /bin/toolbox create --assumeyes 1> /dev/null
+}
+
+toolbox_run_basic() {
+    run_as_core /bin/toolbox run touch ok_toolbox
+}
+
+toolbox_list() {
+    run_as_core /bin/toolbox list --containers
+}
+
+toolbox_count() {
+    toolbox_list | grep --count -E "(fedora|rhel)-toolbox-" || true
+}
+
+toolbox_rm() {
+    toolbox="$(toolbox_list | awk '/(fedora|rhel)-toolbox-/ {print $2}')"
+    run_as_core /bin/toolbox rm -f "${toolbox}"
+}
+
+# Older variants (e.g. RHEL-9.8) use https://github.com/coreos/toolbox
+# NOTE: script uses privileged podman
+if file /bin/toolbox | grep -q "shell script"; then
+    echo "Using toolbox script <https://github.com/coreos/toolbox>"
+
+    toolbox_create() {
+        # Container created on first run of any command
+        run_as_core /bin/toolbox true
+    }
+
+    toolbox_run_basic() {
+        run_as_core /bin/toolbox touch /host/home/core/ok_toolbox
+    }
+
+    toolbox_list() {
+        /bin/podman ps -a
+    }
+
+    toolbox_rm() {
+        toolbox="$(toolbox_list | awk '/(fedora|rhel)-toolbox-/ {print $1}')"
+        /bin/podman rm -f "${toolbox}"
+    }
+fi
+
 # Try five times to create the toolbox to avoid container registry infra flakes
 for i in {1..5}; do
-    machinectl -q shell core@ /bin/toolbox create --assumeyes 1>/dev/null
-    if [[ $(machinectl -qE TERM=dumb shell core@ /bin/toolbox list --containers | grep --count fedora-toolbox-) -ne 1 ]]; then
-        echo "Could not create toolbox on try: $i"
-        sleep 10
-    else
+    toolbox_create || true
+    if [[ $(toolbox_count) -eq 1 ]]; then
         break
     fi
+
+    if [[ $i -eq 5 ]]; then
+        fatal "Could not create toolbox after 5 attempts"
+    fi
+
+    echo "Could not create toolbox on try: $i"
+    sleep 10
 done
-if [[ $(machinectl -qE TERM=dumb shell core@ /bin/toolbox list --containers | grep --count fedora-toolbox-) -ne 1 ]]; then
-    fatal "Could not create toolbox"
-fi
 ok toolbox create
 
-machinectl -q shell core@ /bin/toolbox run touch ok_toolbox
+toolbox_run_basic
 if [[ ! -f '/home/core/ok_toolbox' ]]; then
     fatal "Could not run a simple command inside a toolbox"
 fi
 ok toolbox run
 
-toolbox="$(machinectl -qE TERM=dumb shell core@ /bin/toolbox list --containers | awk '/fedora-toolbox-/ {print $2}')"
-machinectl -q shell core@ /bin/podman stop "${toolbox}"
-machinectl -q shell core@ /bin/toolbox rm "${toolbox}"
-if [[ -n "$(machinectl -qE TERM=dumb shell core@ /bin/toolbox list --containers)" ]]; then
+toolbox_rm
+if [[ $(toolbox_count) -ne 0 ]]; then
     fatal "Could not remove the toolbox container"
 fi
 ok toolbox rm