From: Eric Anholt <eric@anholt.net>
Date: Tue, 7 Apr 2020 00:00:14 +0000 (-0700)
Subject: ci: Disable the firmware loader user helper option in arm64 kernels.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b678568a5ef56a6b87204ec1b0499b7c04591656;p=mesa.git

ci: Disable the firmware loader user helper option in arm64 kernels.

We won't have a user helper, so don't block for 60 seconds for it to show
up.  Speeds up debug of new kernel builds.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5247>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a28250888e6..d18e31bf2c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -195,7 +195,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal-5"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-05-28-cheza"
 
 .use-arm_build:
   variables:
@@ -208,7 +208,7 @@ arm_build:
 x86_cross_arm_test:
   extends: x86_build
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_cross_arm_test "2020-05-13"
+    FDO_DISTRIBUTION_TAG: &x86_cross_arm_test "2020-05-28-cheza"
 
 .use-x86_cross_arm_test:
   variables:
diff --git a/.gitlab-ci/arm64.config b/.gitlab-ci/arm64.config
index 381b08a2729..1cf6ba96fd1 100644
--- a/.gitlab-ci/arm64.config
+++ b/.gitlab-ci/arm64.config
@@ -94,3 +94,4 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 CONFIG_DETECT_HUNG_TASK=y
 
 CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_USER_HELPER=n