From 5174cae8c259c1b9fea02a2e68d8477a9810f9ad Mon Sep 17 00:00:00 2001
From: David Heidelberg <david.heidelberg@collabora.com>
Date: Mon, 31 Jul 2023 10:48:09 +0300
Subject: [PATCH] ci/baremetal: shorten BM_KERNEL to filename and BM_DTB to
 name only

We don't need the path, not at all when we use external kernel.

Acked-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24646>
---
 .gitlab-ci/bare-metal/cros-servo.sh |  2 +-
 .gitlab-ci/bare-metal/fastboot.sh   |  4 ++--
 src/etnaviv/ci/gitlab-ci.yml        |  8 ++++----
 src/freedreno/ci/gitlab-ci.yml      | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci/bare-metal/cros-servo.sh b/.gitlab-ci/bare-metal/cros-servo.sh
index d2c8924880d..975b3510f72 100755
--- a/.gitlab-ci/bare-metal/cros-servo.sh
+++ b/.gitlab-ci/bare-metal/cros-servo.sh
@@ -86,7 +86,7 @@ if echo "$BM_KERNEL" | grep -q http; then
   curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
       $BM_KERNEL -o /tftp/vmlinuz
 else
-  cp $BM_KERNEL /tftp/vmlinuz
+  cp /baremetal-files/"$BM_KERNEL" /tftp/vmlinuz
 fi
 echo "$BM_CMDLINE" > /tftp/cmdline
 
diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index c30a688abec..dc61d763859 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -113,8 +113,8 @@ if echo "$BM_KERNEL $BM_DTB" | grep -q http; then
   cat kernel dtb > Image.gz-dtb
   rm kernel
 else
-  cat $BM_KERNEL $BM_DTB > Image.gz-dtb
-  cp $BM_DTB dtb
+  cat /baremetal-files/"$BM_KERNEL" /baremetal-files/"$BM_DTB".dtb > Image.gz-dtb
+  cp /baremetal-files/"$BM_DTB".dtb dtb
 fi
 
 export PATH=$BM:$PATH
diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index 942803800a9..924f4a300f0 100644
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -30,7 +30,7 @@
     - ./install/bare-metal/fastboot.sh
   variables:
     BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
-    BM_KERNEL: /baremetal-files/zImage
+    BM_KERNEL: zImage
     FLAKES_CHANNEL: "#etnaviv-ci"
 
 .etnaviv-test:arm64:
@@ -41,14 +41,14 @@
     - ./install/bare-metal/fastboot.sh
   variables:
     BM_CMDLINE: "ip=dhcp console=ttymxc0,115200n8 root=/dev/nfs rw nfsrootdebug init=/init $BM_KERNELARGS"
-    BM_KERNEL: /baremetal-files/Image
+    BM_KERNEL: Image
     FLAKES_CHANNEL: "#etnaviv-ci"
 
 .etnaviv-gc2000:arm32:
   extends:
     - .etnaviv-test:arm32
   variables:
-    BM_DTB: /baremetal-files/imx6q-cubox-i.dtb
+    BM_DTB: imx6q-cubox-i
     DEQP_EXPECTED_RENDERER: GC2000
     GPU_VERSION: "etnaviv-gc2000"
   tags:
@@ -58,7 +58,7 @@
   extends:
     - .etnaviv-test:arm64
   variables:
-    BM_DTB: /baremetal-files/imx8mq-nitrogen.dtb
+    BM_DTB: imx8mq-nitrogen
     DEQP_EXPECTED_RENDERER: GC7000
     GPU_VERSION: "etnaviv-gc7000"
   tags:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 5f4606fd7ac..80676af495f 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -129,8 +129,8 @@
   extends:
     - .google-freedreno-test
   variables:
-    BM_KERNEL: /baremetal-files/Image.gz
-    BM_DTB: /baremetal-files/apq8016-sbc.dtb
+    BM_KERNEL: Image.gz
+    BM_DTB: apq8016-sbc
     GPU_VERSION: freedreno-a307
 
 a306_gl:
@@ -181,8 +181,8 @@ a306-traces:
   extends:
     - .google-freedreno-test
   variables:
-    BM_KERNEL: /baremetal-files/Image.gz
-    BM_DTB: /baremetal-files/apq8096-db820c.dtb
+    BM_KERNEL: Image.gz
+    BM_DTB: apq8096-db820c
     GPU_VERSION: freedreno-a530
   tags:
     - google-freedreno-db820c
@@ -386,7 +386,7 @@ a660_gl:
     - .google-freedreno-test
   variables:
     FDO_CI_CONCURRENT: 10
-    BM_KERNEL: /baremetal-files/cheza-kernel
+    BM_KERNEL: cheza-kernel
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init"
     GPU_VERSION: freedreno-a630
   tags: