summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorRohan Garg <rohan.garg@collabora.com>2019-12-05 16:35:08 +0100
committerRohan Garg <rohan@garg.io>2019-12-11 15:19:43 +0000
commit2129b4152cd70fb66659e5f5253dba73d7d50e2a (patch)
tree04dde04ccfcdea153efecee10cca01e68d8f6175 /.gitlab-ci
parent7701b7b7ee9be650077c6209f47e48a78cb3158b (diff)
gitlab-ci: Use lavacli from packages
lavacli 0.9.8 is now available in Debian Testing. Ref: https://tracker.debian.org/news/1066828/lavacli-098-1-migrated-to-testing/ Fixes: 555c0de ("gitlab-ci: Move LAVA-related files into top-level ci dir") Signed-off-by: Rohan Garg <rohan.garg@collabora.com> Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/container/lava_arm.sh21
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml2
2 files changed, 4 insertions, 19 deletions
diff --git a/.gitlab-ci/container/lava_arm.sh b/.gitlab-ci/container/lava_arm.sh
index a21930105de..de03f8ee213 100644
--- a/.gitlab-ci/container/lava_arm.sh
+++ b/.gitlab-ci/container/lava_arm.sh
@@ -15,22 +15,16 @@ apt-get -y install --no-install-recommends \
git \
ccache \
pkg-config \
- python3-mako \
- python-numpy \
- python-six \
- python-mako \
- python3-pip \
python3-setuptools \
- python3-six \
- python3-wheel \
- python3-jinja2 \
+ python-mako \
+ python3-mako \
bison \
flex \
gettext \
cmake \
bc \
libssl-dev \
- lqa \
+ lavacli \
csvkit \
curl \
unzip \
@@ -74,15 +68,6 @@ apt-get -y install --no-install-recommends \
libegl1-mesa-dev:${DEBIAN_ARCH} \
libpng-dev:${DEBIAN_ARCH}
-
-############### Install lavacli (remove after it's back into Debian testing)
-mkdir -p lavacli
-wget -qO- https://git.lavasoftware.org/lava/lavacli/-/archive/v0.9.8/lavacli-v0.9.8.tar.gz | tar -xz --strip-components=1 -C lavacli
-pushd lavacli
-python3 ./setup.py install
-popd
-
-
############### Cross-build dEQP
mkdir -p /artifacts/rootfs/deqp
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 05465c78730..3d3ee05ec3e 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -11,7 +11,7 @@ include:
- .container
variables:
REPO_SUFFIX: ${CI_JOB_NAME}
- DEBIAN_TAG: &debian_tag '2019-12-03-1'
+ DEBIAN_TAG: &debian_tag '2019-12-05-1'
DEBIAN_EXEC: 'DEBIAN_ARCH=${DEBIAN_ARCH}
GCC_ARCH=${GCC_ARCH}
KERNEL_ARCH=${KERNEL_ARCH}