unify path for images

Author: jscotka

.testinfo.tmt

@@ -20,7 +20,6 @@ RUN dnf -y update && \
     python3-rpmfluff \
     python3-rpm \
     squid \
-    strace \
     make \
     openssh-clients && \
     dnf -y clean all

containers/runner/Dockerfile

@@ -7,7 +7,8 @@
 
 set -eu
 
-BASEDIR=$(dirname $(dirname $(dirname $(realpath $0))))
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+BASEDIR="$(dirname $(dirname $SCRIPT_DIR ))"
 CRUN=${CRUN:-$(which podman docker 2>/dev/null | head -n1)}
 CONTAINER=${CONTAINER:-quay.io/rhinstaller/kstest-runner}
 # Podman in rootless mode does not have access to /dev/kvm socket https://bugzilla.redhat.com/show_bug.cgi?id=1901462
@@ -16,6 +17,7 @@ PODMAN_SELINUX_FIX=
 RUN_COMMAND=/kickstart-tests/containers/runner/run-kstest
 SCENARIO=${SCENARIO:-unknown}
 BOOT_ISO="boot.iso"
+IMAGES_DIR=$BASEDIR/data/images
 
 # Get number of jobs to be run in parallel based on number of CPUs and amount of RAM
 recommended_jobs() {
@@ -69,12 +71,13 @@ Options:
  --scenario NAME                      Name of the tests being run, used to group results in json
                                       logs.
  --dry-run                            Do not run the tests, only process kickstarts
+ --data DIR                           Use DIR as the data directory for images and logs (default: BASEDIR/data)
  -h, --help                           Show this help
 EOF
 }
 
 # parse options
-eval set -- "$(getopt -o j:p:t:s:u:rch --long jobs:,platform:,testtype:,skip-testtypes:,updates:,retry,connect-shell,daily-iso:,defaults:,run-args:,recommended-jobs,scenario:,timeout:,dry-run,help -- "$@")"
+eval set -- "$(getopt -o j:p:t:s:u:rch --long jobs:,platform:,testtype:,skip-testtypes:,updates:,retry,connect-shell,daily-iso:,defaults:,run-args:,recommended-jobs,scenario:,timeout:,dry-run,data:,help -- "$@")"
 
 while true; do
     case "${1:-}" in
@@ -92,6 +95,7 @@ while true; do
         --timeout) shift; TIMEOUT="$1" ;;
         --scenario) shift; SCENARIO="$1" ;;
         --dry-run) DRY_RUN=1 ;;
+        --data) shift; DATA_DIR="$1" ;;
         -h|--help) usage; exit 0 ;;
         --) shift; break ;;
     esac
@@ -108,27 +112,35 @@ else
     KSTESTS_TEST="$*"
 fi
 
+
+DATA_DIR="${DATA_DIR:-$BASEDIR/data}"
+IMAGES_DIR="$DATA_DIR/images"
+LOGS_DIR="$DATA_DIR/logs"
+
+
 # prepare data directory
-mkdir -p data/images
-mkdir -p -m 777 data/logs
-if ! [ -e "data/images/boot.iso" ]; then
+mkdir -p "$IMAGES_DIR"
+mkdir -p "$LOGS_DIR"
+chmod -R a+rwx "$LOGS_DIR" || true # ignore errors when running as non-root
+
+if ! [ -e "$IMAGES_DIR/boot.iso" ]; then
     BOOT_ISO="boot-${PLATFORM}.iso"
     # do not download the ISO if it already exists
-    if ! [ -e "data/images/boot-${PLATFORM}.iso" ]; then
+    if ! [ -e "$IMAGES_DIR/boot-${PLATFORM}.iso" ]; then
         if [ -n "${DAILY_ISO_TOKEN:-}" ]; then
-            echo "INFO: data/images/${BOOT_ISO} does not exist, downloading daily iso..."
-            $PWD/containers/runner/fetch_daily_iso.sh ${DAILY_ISO_TOKEN} data/images/boot-${PLATFORM}.iso
+            echo "INFO: $IMAGES_DIR/${BOOT_ISO} does not exist, downloading daily iso..."
+            $BASEDIR/containers/runner/fetch_daily_iso.sh ${DAILY_ISO_TOKEN} $IMAGES_DIR/boot-${PLATFORM}.iso
         else
-            echo "INFO: data/images/${BOOT_ISO} does not exist, downloading current ${PLATFORM} image..."
+            echo "INFO: $IMAGES_DIR/${BOOT_ISO} does not exist, downloading current ${PLATFORM} image..."
             source scripts/defaults-${PLATFORM}.sh
-            curl -L  "${KSTEST_URL}/images/boot.iso" --output data/images/boot-${PLATFORM}.iso
+            curl -L  "${KSTEST_URL}/images/boot.iso" --output $IMAGES_DIR/boot-${PLATFORM}.iso
         fi
-        echo "Using downloaded data/images/${BOOT_ISO}"
+        echo "Using downloaded $IMAGES_DIR/${BOOT_ISO}"
     else
-        echo "Using existing data/images/${BOOT_ISO}"
+        echo "Using existing $IMAGES_DIR/${BOOT_ISO}"
     fi
 else
-    echo "Using existing data/images/${BOOT_ISO}"
+    echo "Using existing $IMAGES_DIR/${BOOT_ISO}"
 fi
 
 # support both path and URL for --updates
@@ -182,6 +194,6 @@ $CRUN run -it --rm --device=/dev/kvm --publish 127.0.0.1::16509 $PODMAN_SELINUX_
     ${TEST_ENV_VARS} \
     ${VAR_TMP:-} \
     ${DEFAULTS_SH_ARGS:-} \
-    -v "$PWD/data:/opt/kstest/data:z" \
+    -v "$DATA_DIR:/opt/kstest/data:z" \
     -v "$BASEDIR:/kickstart-tests:ro,z" \
     $CONTAINER $RUN_COMMAND

containers/runner/launch

@@ -335,14 +335,6 @@
         tag:
         - security
         test+: certificate.sh
-  /check_for_disabled_modules:
-    /x:
-      /x:
-        tag:
-        - ui
-        - anaconda
-        - addons
-        test+: check_for_disabled_modules.sh
   /clearpart:
     /1:
       /x:
@@ -611,15 +603,22 @@
         - firewall
         - coverage
         test+: firewall.sh
-  /functions:
-    /proxy:
-      /x:
-        tag: []
-        test+: functions-proxy.sh
-    /x:
+  /flatpak:
+    /preinstall:
+      /ftp:
+        tag:
+        - packaging
+        - payload
+        - skip-on-fedora
+        - skip-on-rhel-9
+        test+: flatpak-preinstall-ftp.sh
       /x:
-        tag: []
-        test+: functions.sh
+        tag:
+        - packaging
+        - payload
+        - skip-on-fedora
+        - skip-on-rhel-9
+        test+: flatpak-preinstall.sh
   /geolocation:
     /off:
       /by-default-with-ks:
@@ -865,9 +864,6 @@
         tag:
         - logs
         test+: log-util-check.sh
-      /tests:
-        tag: []
-        test+: log-util-tests.sh
   /lvm:
     /1:
       /x:
@@ -1392,34 +1388,12 @@
         - partition
         - luks
         test+: part-luks-4.sh
-  /post:
-    /lib:
-      /keyboard:
-        tag: []
-        test+: post-lib-keyboard.sh
-      /network:
-        tag: []
-        test+: post-lib-network.sh
-    /nochroot:
-      /lib-keyboard:
-        tag: []
-        test+: post-nochroot-lib-keyboard.sh
-      /lib-network:
-        tag: []
-        test+: post-nochroot-lib-network.sh
-      /lib-ui:
-        tag: []
-        test+: post-nochroot-lib-ui.sh
   /pre:
     /install:
       /x:
         tag:
         - kickstart
         test+: pre-install.sh
-    /lib:
-      /harddrive:
-        tag: []
-        test+: pre-lib-harddrive.sh
   /preexisting:
     /btrfs:
       /x:
@@ -1704,11 +1678,6 @@
         tag:
         - ksscript
         test+: script-pre.sh
-  /scripts:
-    /lib:
-      /x:
-        tag: []
-        test+: scripts-lib.sh
   /selinux:
     /contexts:
       /x:
@@ -1960,14 +1929,6 @@
         tag:
         - users
         test+: user-wheel-no-root.sh
-  /validate:
-    /lib:
-      /initial-setup:
-        tag: []
-        test+: validate-lib-initial-setup.sh
-      /services:
-        tag: []
-        test+: validate-lib-services.sh
   /vlan:
     /httpks:
       /x:
@@ -1980,4 +1941,4 @@
         - network
         test+: vlan-pre.sh
 duration: 50m
-test: 'mkdir -p data/{images,logs}; chmod -R a+rwx data; ./containers/runner/launch --platform rhel10 '
+test: ./containers/runner/launch --data /var/tmp/ks_data --platform rhel10

main.fmf

@@ -6,26 +6,24 @@ provision:
       memory: '>= 8 GB'
   how: connect
   user: root
-  guest: 10.0.185.156
-  #key: /home/jscotka/git/cockpit-project/tests/cockpit-tests/.ssh/id_rsa
+  guest: 10.0.186.80
   key: /usr/share/qa-tools/1minutetip/1minutetip-ecdsa
 
 discover:
     - how: fmf
-      filter: tag:keyboard
+      filter: "tag: -knownfailure"
 
 execute:
     how: tmt
 
+
 prepare:
     - how: install
       package:
         - podman
         - qemu-kvm
         - libvirt
         - git
-    - how: shell
+#    - how: shell
 #      script:
-#        - mkdir -p data/{images,logs}
-#        - chmod -R a+rwx data
 #        - curl --insecure -o ./data/images/boot-rhel10.iso http://ftp.sh.cvut.cz/centos-stream/10-stream/BaseOS/x86_64/iso/CentOS-Stream-10-20250707.0-x86_64-boot.iso

plans/granular.fmf

@@ -5,6 +5,7 @@
 from subprocess import check_output
 import yaml
 from pprint import pprint
+import os
 
 KSTESTDIR_ENV="KSTESTDIR"
 MAX_DEPTH = 2
@@ -13,7 +14,9 @@ class RawTMTMetadata:
     tmt_file = "main.fmf"
     tmt_tag = "tag"
     tmt_test = "test"
-    tmt_test_prefix = "mkdir -p data/{images,logs}; chmod -R a+rwx data; ./containers/runner/launch --platform rhel10 "
+    launch_data_var = "--data /var/tmp/ks_data"
+    platform_var = "--platform rhel10"
+    tmt_test_prefix = f"./containers/runner/launch {launch_data_var} {platform_var}"
     tmt_base_test_structure_list = ["tests"]
     tmt_stuff_item = ["x"]
 
@@ -77,7 +80,8 @@ def go(self):
         self.store_tmt_file()
 
 def list_files(path: str, pattern: str) -> list:
-    return glob(f"{path}/{pattern}")
+    files = glob(f"{path}/{pattern}")
+    return [f for f in files if os.access(f, os.X_OK)]