diff options
| author | Corentin Noël <corentin.noel@collabora.com> | 2021-04-07 14:54:50 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-04-07 17:26:29 +0000 |
| commit | 4e5ea3761255d98cf21cdadb87091750c15606b4 (patch) | |
| tree | 4a184056b51323128d80e22fff6b97b88936d499 /.gitlab-ci | |
| parent | d4db68b338a9c6b009fa9d9fa05e13ce0215861b (diff) | |
ci: Use lavacli from master
This allows to fix some credential leaks and provides compatibility with
the latest LAVA version.
Avoids failures when the LAVA instance returns Error 500
Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9851>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/arm_build.sh | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh index 4f6ed560514..89a06c52806 100644 --- a/.gitlab-ci/container/arm_build.sh +++ b/.gitlab-ci/container/arm_build.sh @@ -7,6 +7,12 @@ apt-get -y install ca-certificates sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list apt-get update + +EPHEMERAL=" + python3-pytest-runner + python3-wheel + " + apt-get -y install \ abootimg \ android-sdk-ext4-utils \ @@ -22,7 +28,6 @@ apt-get -y install \ g++ \ git \ kmod \ - lavacli \ libasan5 \ libdrm-dev \ libelf-dev \ @@ -44,22 +49,32 @@ apt-get -y install \ llvm-8-dev \ pkg-config \ python \ + python3-aiohttp \ + python3-jinja2 \ python3-mako \ python3-pil \ python3-pip \ python3-requests \ python3-setuptools \ + python3-yaml \ + python3-zmq \ u-boot-tools \ unzip \ wget \ xz-utils \ - zlib1g-dev + zlib1g-dev \ + $EPHEMERAL + +# Update lavacli to v1.1+ +pip3 install git+https://git.lavasoftware.org/lava/lavacli@3db3ddc45e5358908bc6a17448059ea2340492b7 pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366 apt install -y --no-remove -t buster-backports \ meson +apt-get purge -y $EPHEMERAL + arch=armhf . .gitlab-ci/container/cross_build.sh |