ci: Make sure that we have a proper shell prompt for LAVA.

LAVA finds a '#' early in boot and races to emit its shell commands.
Apparently for the current boards those serial commands end up getting
buffered such that things work out, but for db410c and db820c, the buffer
is lost and LAVA gets stuck waiting for the prompt.  By setting a prompt,
we can delay our commands until we're actually supposed to emit them (and
suppress a complaint from the lava dispatcher that we're using a risky
prompt!)

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3883>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b6c97a6b697c6d83b2fb228fd3426a0c9de0a34..579056ae2fd07e99aed959bcdf97961611358f70 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,7 +165,7 @@ arm_build:
     - .debian@container-ifnot-exists@arm64v8
     - .container
   variables:
-    DEBIAN_TAG: &arm_build "2020-02-05"
+    DEBIAN_TAG: &arm_build "2020-02-19"
 
 .use-arm_build:
   variables:

diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh
index 810924061fb3d2eb449ea40650bebf90d2d36a15..04441ee50d15b9fc8f05669adb0129e2e2be23ed 100644 (file)
--- a/.gitlab-ci/create-rootfs.sh
+++ b/.gitlab-ci/create-rootfs.sh
@@ -20,7 +20,13 @@ apt-get -y install --no-install-recommends \
     $LLVM
 passwd root -d
 chsh -s /bin/sh
-ln -s /bin/sh /init
+
+cat > /init <<EOF
+#!/bin/sh
+export PS1=lava-shell:
+exec sh
+EOF
+chmod +x  /init
 
 #######################################################################
 # Strip the image to a small minimal system without removing the debian

diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2
index 8b7b4b12034ffb57c788aa262e9b7df94ab6ec40..0872ba29acce25d2f3b44eec2f6f09631a43db80 100644 (file)
--- a/.gitlab-ci/lava-deqp.yml.jinja2
+++ b/.gitlab-ci/lava-deqp.yml.jinja2
@@ -38,7 +38,7 @@ actions:
     method: {{ boot_method }}
     commands: ramdisk
     prompts:
-      - '#' 
+      - 'lava-shell:'
 - test:
     timeout:
       minutes: 60