From 3b5e71cb181bae7646abe561a779b3d2062ba0cb Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 1 May 2020 09:57:00 -0700
Subject: [PATCH] ci: Enable IRC flake reporting on freedreno baremetal boards.

The IRC channel is useful for me to track and ban flaky tests before they
irritate people too much.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2654
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4896>
---
 .gitlab-ci.yml                    | 3 ++-
 .gitlab-ci/bare-metal/fastboot.sh | 6 ++++++
 .gitlab-ci/bare-metal/init.sh     | 2 ++
 .gitlab-ci/create-rootfs.sh       | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 409ed8ef609..660fa377bbb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,7 +174,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-04-01-jflags"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-05-01-netcat"
 
 .use-arm_build:
   variables:
@@ -825,6 +825,7 @@ arm64_a306_gles2:
     BM_DTB: /lava-files/apq8016-sbc.dtb
     BM_ROOTFS: /lava-files/rootfs-arm64
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8"
+    FLAKES_CHANNEL: "#freedreno-ci"
     DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
     DEQP_SKIPS: deqp-freedreno-a307-skips.txt
     DEQP_VER: gles2
diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 5d2d1de176c..8b0577ce082 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -55,11 +55,17 @@ cp $BM/init.sh rootfs/init
 touch rootfs/set-job-env-vars.sh
 chmod +x rootfs/set-job-env-vars.sh
 for var in \
+    CI_JOB_URL \
+    CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
+    CI_MERGE_REQUEST_TITLE \
     CI_NODE_INDEX \
     CI_NODE_TOTAL \
+    CI_PIPELINE_ID \
+    CI_RUNNER_DESCRIPTION \
     DEQP_EXPECTED_RENDERER \
     DEQP_PARALLEL \
     DEQP_VER \
+    FLAKES_CHANNEL \
     ; do
   val=`echo ${!var} | sed 's|"||g'`
   echo "export $var=\"${val}\"" >> rootfs/set-job-env-vars.sh
diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index edaaa9692cd..ae3e071a52c 100644
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -11,6 +11,8 @@ mount -t devpts devpts /dev/pts
 export DEQP_NO_SAVE_RESULTS=1
 . /set-job-env-vars.sh
 
+echo "nameserver 8.8.8.8" > /etc/resolv.conf
+
 export DEQP_SKIPS=deqp-skips.txt
 if [ -e /install/deqp-expected-fails.txt ]; then
   export DEQP_EXPECTED_FAILS=deqp-expected-fails.txt
diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh
index 89d50d3f5a1..aa6449e097e 100644
--- a/.gitlab-ci/create-rootfs.sh
+++ b/.gitlab-ci/create-rootfs.sh
@@ -12,6 +12,7 @@ apt-get -y install --no-install-recommends \
     libdrm2 \
     libdrm-nouveau2 \
     firmware-qcom-media \
+    netcat-openbsd \
     wget \
     xz-utils
 passwd root -d
-- 
2.30.2