Mesa (master): ci/db410c: Fix networking so we get artifacts from our jobs.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: dd34d28de72b590c6b9a425f7829210bb8d2e2f1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd34d28de72b590c6b9a425f7829210bb8d2e2f1

Author: Eric Anholt <eric at anholt.net>
Date:   Sat Nov  7 09:32:02 2020 -0800

ci/db410c: Fix networking so we get artifacts from our jobs.

Seems some sort of linux change (bugfix?) resulted in the db410cs
selecting device mode for the db410cs due to the micro cable being
plugged in (fastboot runs them in device mode), so we weren't finding
the network and getting artifacts out.

Closes: #3728
Acked-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6971>

---

 .gitlab-ci.yml                     | 2 +-
 .gitlab-ci/container/lava_build.sh | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff9d2734c48..1081793cda5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -414,7 +414,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-11-09-deqp-version"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-11-09-db410c-net"
 
 .use-arm64_test:
   variables:
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index ecb160d6457..e42363e8981 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -158,6 +158,10 @@ if [ -n "$INSTALL_KERNEL_MODULES" ]; then
     sed -i 's/=m/=n/g' ${DEFCONFIG}
 fi
 
+# Force db410c to host mode instead of OTG (which is otherwise selected by
+# default due to our micro cable for fastboot)
+sed -i 's/dr_mode = "otg"/dr_mode = "host"/' arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+
 ./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config
 make ${KERNEL_IMAGE_NAME}
 for image in ${KERNEL_IMAGE_NAME}; do