diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-03-22 17:02:50 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-04-14 13:05:08 +0000 |
| commit | db4ddced5fd6dd45d8f7ca49db3eb2489eff6b60 (patch) | |
| tree | a74e5355497c12df59e8e3cd636c3c5863ff848d /.gitlab-ci | |
| parent | b0ab534c2d8754df2ff5a8a05be96c9ea5b7412f (diff) | |
ci: Install Rust & cargo from Debian for x86_test* images
Also build deqp-runner once in x86_test-base instead of separately in
x86_test-{gl,vk}.
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/container/lava_build.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_test-base.sh | 5 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_test-gl.sh | 5 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_test-vk.sh | 5 |
4 files changed, 6 insertions, 11 deletions
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 6bee014131d..4918b3d012e 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -187,7 +187,7 @@ popd rm -rf kernel ############### Delete rust, since the tests won't be compiling anything. -rm -rf /root/.rustup /root/.cargo +rm -rf /root/.cargo ############### Create rootfs set +e diff --git a/.gitlab-ci/container/x86_test-base.sh b/.gitlab-ci/container/x86_test-base.sh index 0f0f8a630e5..0eff8b4e42c 100644 --- a/.gitlab-ci/container/x86_test-base.sh +++ b/.gitlab-ci/container/x86_test-base.sh @@ -12,6 +12,7 @@ sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list # Ephemeral packages (installed for this script and removed again at # the end) STABLE_EPHEMERAL=" \ + cargo \ python3-dev \ python3-pip \ python3-setuptools \ @@ -61,6 +62,10 @@ apt-get install -y --no-install-recommends \ # and doesn't depend on git pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@0f1abc24c043e63894085a6bd12f14263e8b29eb +############### Build dEQP runner +. .gitlab-ci/container/build-deqp-runner.sh +rm -rf ~/.cargo + apt-get purge -y $STABLE_EPHEMERAL apt-get autoremove -y --purge diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index 4b311cb05dd..03dfbf5918a 100644 --- a/.gitlab-ci/container/x86_test-gl.sh +++ b/.gitlab-ci/container/x86_test-gl.sh @@ -72,11 +72,6 @@ apt-get install -y --no-remove \ INCLUDE_OPENCL_TESTS=1 . .gitlab-ci/container/build-piglit.sh -############### Build dEQP runner (and install rust temporarily for it) -. .gitlab-ci/container/build-rust.sh -. .gitlab-ci/container/build-deqp-runner.sh -rm -rf /root/.rustup /root/.cargo - ############### Build dEQP GL DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index 7274a2ba563..fba8822be8e 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -115,11 +115,6 @@ wine \ PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh -############### Build dEQP runner (and install rust temporarily for it) -. .gitlab-ci/container/build-rust.sh -. .gitlab-ci/container/build-deqp-runner.sh -rm -rf /root/.rustup /root/.cargo - ############### Build Fossilize . .gitlab-ci/container/build-fossilize.sh |