unify path for images

Author: jscotkahat

containers/runner/launch

@@ -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() {
@@ -109,26 +111,27 @@ else
 fi
 
 # prepare data directory
-mkdir -p data/images
-mkdir -p -m 777 data/logs
-if ! [ -e "data/images/boot.iso" ]; then
+mkdir -p $BASEDIR/data/{images,logs}
+chmod -R a+rwx $BASEDIR/data/logs
+
+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 +185,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 "$BASEDIR/data:/opt/kstest/data:z" \
     -v "$BASEDIR:/kickstart-tests:ro,z" \
     $CONTAINER $RUN_COMMAND

main.fmf

@@ -1980,4 +1980,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 --platform rhel10 '

plans/granular.fmf

@@ -6,16 +6,16 @@ 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.184.133
   key: /usr/share/qa-tools/1minutetip/1minutetip-ecdsa
 
 discover:
     - how: fmf
-      filter: tag:keyboard
+      #filter: tag:keyboard
 
 execute:
     how: tmt
+    
 
 prepare:
     - how: install