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>
This commit is contained in:
parent
b0ab534c2d
commit
db4ddced5f
|
@ -397,7 +397,7 @@ android_build:
|
|||
x86_test-base:
|
||||
extends: x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &x86_test-base "2021-03-31-librenderdoc"
|
||||
MESA_IMAGE_TAG: &x86_test-base "2021-03-31-cargo"
|
||||
|
||||
.use-x86_test-base:
|
||||
extends:
|
||||
|
@ -413,13 +413,13 @@ x86_test-base:
|
|||
x86_test-gl:
|
||||
extends: .use-x86_test-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-llvm-spirv"
|
||||
MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-cargo"
|
||||
|
||||
# Debian 11 based x86 test image for VK
|
||||
x86_test-vk:
|
||||
extends: .use-x86_test-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &x86_test-vk "2021-04-14-librenderdoc"
|
||||
MESA_IMAGE_TAG: &x86_test-vk "2021-04-14-cargo"
|
||||
|
||||
# Debian 11 based ARM build image
|
||||
arm_build:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue