ci: move general build commands to their own section

The STRIP_CMD env var is used in several build scripts, not just by
dEQP.

Also, we want to have the rootfs destination directory created so it
also exists for builds that only move directory trees in there.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388>
This commit is contained in:
Andres Gomez 2020-11-11 21:29:46 +02:00 committed by Marge Bot
parent 8860fa931e
commit 5f6f84bf81
3 changed files with 9 additions and 5 deletions

View File

@ -408,7 +408,7 @@ arm64_test:
extends:
- .use-arm_test-base
variables:
MESA_IMAGE_TAG: &arm64_test "2020-12-17-fdo-upstream-repo"
MESA_IMAGE_TAG: &arm64_test "2020-12-18-lava"
.use-arm64_test:
variables:
@ -422,7 +422,7 @@ armhf_test:
extends:
- .use-arm_test-base
variables:
MESA_IMAGE_TAG: &armhf_test "2020-12-17-fdo-upstream-repo"
MESA_IMAGE_TAG: &armhf_test "2020-12-18-lava"
.use-armhf_test:
variables:

View File

@ -97,15 +97,19 @@ if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
qtbase5-dev:armhf
fi
############### Build dEQP runner
############### Building
STRIP_CMD="${GCC_ARCH}-strip"
mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}
############### Build dEQP runner
. .gitlab-ci/build-deqp-runner.sh
mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin
mv /usr/local/bin/deqp-runner /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/.
############### Build dEQP
STRIP_CMD="${GCC_ARCH}-strip"
DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh
mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.

View File

@ -1,5 +1,5 @@
variables:
DISTRIBUTION_TAG: "2020-12-17-fdo-upstream-repo"
DISTRIBUTION_TAG: "2020-12-18-lava"
.kernel+rootfs:
stage: container-2