From 1eb98bc45743a151e44208d5dfb153af1006cc54 Mon Sep 17 00:00:00 2001
From: Vignesh Raman <vignesh.raman@collabora.com>
Date: Mon, 2 Sep 2024 16:10:33 +0530
Subject: [PATCH] ci: move mtl-fw.json to .gitlab-ci directory

Placing mtl-fw.json in src/intel/ci/mtl-fw.json works for the
mesa build, but it fails to fetch in drm-ci. Move it to the
.gitlab-ci directory so it is included in the artifacts used
for building the kernel/rootfs in drm-ci.

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30947>
---
 .gitlab-ci/container/gitlab-ci.yml               | 16 +++++++++++++---
 .../ci => .gitlab-ci/firmware/i915}/mtl-fw.json  |  0
 .gitlab-ci/image-tags.yml                        |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)
 rename {src/intel/ci => .gitlab-ci/firmware/i915}/mtl-fw.json (100%)

diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 880dfc45d9d..7d40013fc89 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -394,16 +394,23 @@ fedora/x86_64_build:
 # Get firmware directly rather than using package versions.
 # Change KERNEL_ROOTFS_TAG to add firmware changes.
 # FIRMWARE_FILES is a list of json files arranged by vendor in src/**/ci/
-.firmware:
+.firmware_x86_64:
+  variables:
+    FIRMWARE_FILES: |
+      .gitlab-ci/firmware/i915/mtl-fw.json
+
+.firmware_arm64:
+  variables:
+    FIRMWARE_FILES: |
+
+.firmware_arm32:
   variables:
     FIRMWARE_FILES: |
-      src/intel/ci/mtl-fw.json
 
 .kernel+rootfs:
   extends:
     - .container+build-rules
     - .debian-container-version
-    - .firmware
   stage: container
   timeout: 90m
   variables:
@@ -417,6 +424,7 @@ kernel+rootfs_x86_64:
   extends:
     - .use-debian/x86_64_build-base
     - .kernel+rootfs
+    - .firmware_x86_64
   image: "$FDO_BASE_IMAGE"
   variables:
     DEBIAN_ARCH: "amd64"
@@ -426,6 +434,7 @@ kernel+rootfs_arm64:
   extends:
     - .use-debian/arm64_build
     - .kernel+rootfs
+    - .firmware_arm64
   tags:
     - aarch64
   variables:
@@ -434,6 +443,7 @@ kernel+rootfs_arm64:
 kernel+rootfs_arm32:
   extends:
     - kernel+rootfs_arm64
+    - .firmware_arm32
   variables:
     DEBIAN_ARCH: "armhf"
 
diff --git a/src/intel/ci/mtl-fw.json b/.gitlab-ci/firmware/i915/mtl-fw.json
similarity index 100%
rename from src/intel/ci/mtl-fw.json
rename to .gitlab-ci/firmware/i915/mtl-fw.json
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index c18cebdb84d..4c89e87fb3c 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -30,7 +30,7 @@ variables:
    DEBIAN_TEST_ANDROID_TAG: "20240826-runner"
    DEBIAN_TEST_GL_TAG: "20240830-piglit-93"
    DEBIAN_TEST_VK_TAG: "20240830-piglit-93"
-   KERNEL_ROOTFS_TAG: "20240830-piglit-93"
+   KERNEL_ROOTFS_TAG: "20240902-mtlfw"
 
    ALPINE_X86_64_BUILD_TAG: "20240814-var"
    ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"