To be more consistent and to declutter the .gitlab-ci dir.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Eric Anholt <eric@anholt.net>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8757>
- .fdo.container-build@debian
- .container
variables:
- MESA_IMAGE_TAG: &x86_build-base "2021-01-08-more-vulkan-cross"
+ MESA_IMAGE_TAG: &x86_build-base "2021-02-08-container-reorg"
.use-x86_build-base:
extends:
extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &x86_build "2021-02-02-procps"
+ MESA_IMAGE_TAG: &x86_build "2021-02-08-container-reorg"
.use-x86_build:
variables:
extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &i386_build "2021-01-08-more-vulkan-cross"
+ MESA_IMAGE_TAG: &i386_build "2021-02-08-container-reorg"
.use-i386_build:
variables:
extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &ppc64el_build "2021-01-08-more-vulkan-cross"
+ MESA_IMAGE_TAG: &ppc64el_build "2021-02-08-container-reorg"
.use-ppc64el_build:
variables:
extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &s390x_build "2021-01-08-more-vulkan-cross"
+ MESA_IMAGE_TAG: &s390x_build "2021-02-08-container-reorg"
.use-s390x_build:
variables:
extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &android_build "2020-12-17-use-ephemeral"
+ MESA_IMAGE_TAG: &android_build "2021-02-08-container-reorg"
.use-android_build:
variables:
x86_test-base:
extends: x86_build-base
variables:
- MESA_IMAGE_TAG: &x86_test-base "2021-01-14-asan"
+ MESA_IMAGE_TAG: &x86_test-base "2021-02-08-container-reorg"
.use-x86_test-base:
extends:
x86_test-gl:
extends: .use-x86_test-base
variables:
- MESA_IMAGE_TAG: &x86_test-gl "2021-02-05-runner"
+ MESA_IMAGE_TAG: &x86_test-gl "2021-02-08-container-reorg"
# Debian 10 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
- MESA_IMAGE_TAG: &x86_test-vk "2021-02-05-runner"
+ MESA_IMAGE_TAG: &x86_test-vk "2021-02-08-container-reorg"
# Debian 10 based ARM build image
arm_build:
- .fdo.container-build@debian@arm64v8
- .container
variables:
- MESA_IMAGE_TAG: &arm_build "2020-12-23-opengl"
+ MESA_IMAGE_TAG: &arm_build "2021-02-08-container-reorg"
.use-arm_build:
variables:
- .fdo.container-build@debian
- .container
variables:
- MESA_IMAGE_TAG: &arm_test-base "2021-01-21-noexpect"
+ MESA_IMAGE_TAG: &arm_test-base "2021-02-08-container-reorg"
.use-arm_test-base:
extends:
extends:
- .use-arm_test-base
variables:
- MESA_IMAGE_TAG: &arm64_test "2021-02-01-runner"
+ MESA_IMAGE_TAG: &arm64_test "2021-02-08-container-reorg"
.use-arm64_test:
variables:
extends:
- .use-arm_test-base
variables:
- MESA_IMAGE_TAG: &armhf_test "2021-02-01-runner"
+ MESA_IMAGE_TAG: &armhf_test "2021-02-08-container-reorg"
.use-armhf_test:
variables:
# Drop some large tools we won't use in this build.
find /android-ndk-r21d/ -type f | egrep -i "clang-check|clang-tidy|lldb" | xargs rm -f
-sh .gitlab-ci/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3"
+sh .gitlab-ci/container/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3"
-sh .gitlab-ci/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64
-sh .gitlab-ci/create-android-cross-file.sh /$ndk i686-linux-android x86 x86
-sh .gitlab-ci/create-android-cross-file.sh /$ndk aarch64-linux-android arm armv8
-sh .gitlab-ci/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl armv7a-linux-androideabi
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x86 x86
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android arm armv8
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl armv7a-linux-androideabi
# Not using build-libdrm.sh because we don't want its cleanup after building
# each arch. Fetch and extract now.
# dependencies where we want a specific version
EXTRA_MESON_ARGS=
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
. .gitlab-ci/container/container_post_build.sh
############### Create cross-files
-. .gitlab-ci/create-cross-file.sh $arch
+. .gitlab-ci/container/create-cross-file.sh $arch
. .gitlab-ci/container/container_pre_build.sh
apt-get install -y --no-remove -t buster-backports \
$LLVM:$arch
-. .gitlab-ci/create-cross-file.sh $arch
+. .gitlab-ci/container/create-cross-file.sh $arch
. .gitlab-ci/container/container_pre_build.sh
# dependencies where we want a specific version
EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)"
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
apt-get purge -y \
$STABLE_EPHEMERAL
. .gitlab-ci/container/container_pre_build.sh
# Install rust, which we'll be using for deqp-runner. It will be cleaned up at the end.
-. .gitlab-ci/build-rust.sh
+. .gitlab-ci/container/build-rust.sh
if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
GCC_ARCH="aarch64-linux-gnu"
DEFCONFIG="arch/arm/configs/multi_v7_defconfig"
DEVICE_TREES="arch/arm/boot/dts/rk3288-veyron-jaq.dtb arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dtb"
KERNEL_IMAGE_NAME="zImage"
- . .gitlab-ci/create-cross-file.sh armhf
+ . .gitlab-ci/container/create-cross-file.sh armhf
else
GCC_ARCH="x86_64-linux-gnu"
KERNEL_ARCH="x86_64"
############### Build dEQP runner
-. .gitlab-ci/build-deqp-runner.sh
+. .gitlab-ci/container/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
-DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh
+DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.
############### Build piglit
if [ -n "$INCLUDE_PIGLIT" ]; then
- . .gitlab-ci/build-piglit.sh
+ . .gitlab-ci/container/build-piglit.sh
mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/.
fi
############### Build apitrace
-. .gitlab-ci/build-apitrace.sh
+. .gitlab-ci/container/build-apitrace.sh
mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
mv /apitrace/build /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
rm -rf /apitrace
############### Build renderdoc
EXTRA_CMAKE_ARGS+=" -DENABLE_XCB=false"
-. .gitlab-ci/build-renderdoc.sh
+. .gitlab-ci/container/build-renderdoc.sh
mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc
mv /renderdoc/build /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc
rm -rf /renderdoc
############### Build libdrm
EXTRA_MESON_ARGS+=" -D prefix=/libdrm"
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
############### Cross-build kernel
sed -i 's/=m/=n/g' ${DEFCONFIG}
fi
-./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config
+./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/container/${KERNEL_ARCH}.config
make ${KERNEL_IMAGE_NAME}
for image in ${KERNEL_IMAGE_NAME}; do
cp arch/${KERNEL_ARCH}/boot/${image} /lava-files/.
cat /lava-files/rootfs-${DEBIAN_ARCH}/debootstrap/debootstrap.log
set -e
-cp .gitlab-ci/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/.
+cp .gitlab-ci/container/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/.
cp .gitlab-ci/container/llvm-snapshot.gpg.key /lava-files/rootfs-${DEBIAN_ARCH}/.
chroot /lava-files/rootfs-${DEBIAN_ARCH} \
sh -c "INCLUDE_PIGLIT=$INCLUDE_PIGLIT sh /create-rootfs.sh"
cd $LIBXCB_VERSION; ./configure; make install; cd ..
rm -rf $LIBXCB_VERSION
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
pushd libglvnd-v$GLVND_VERSION; ./autogen.sh; ./configure; make install; popd
rm -rf libglvnd-v$GLVND_VERSION
-. .gitlab-ci/build-spirv-tools.sh
+. .gitlab-ci/container/build-spirv-tools.sh
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_100 --depth 1
pushd SPIRV-LLVM-Translator
############### Build spirv-tools (debian too old)
-. .gitlab-ci/build-spirv-tools.sh
+. .gitlab-ci/container/build-spirv-tools.sh
############### Build libclc
-. .gitlab-ci/build-libclc.sh
+. .gitlab-ci/container/build-libclc.sh
############### Build virglrenderer
-. .gitlab-ci/build-virglrenderer.sh
+. .gitlab-ci/container/build-virglrenderer.sh
############### Build piglit
-INCLUDE_OPENCL_TESTS=1 . .gitlab-ci/build-piglit.sh
+INCLUDE_OPENCL_TESTS=1 . .gitlab-ci/container/build-piglit.sh
############### Build dEQP runner (and install rust temporarily for it)
-. .gitlab-ci/build-rust.sh
-. .gitlab-ci/build-deqp-runner.sh
+. .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/build-deqp.sh
+DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
############### Build apitrace
-. .gitlab-ci/build-apitrace.sh
+. .gitlab-ci/container/build-apitrace.sh
############### Build renderdoc
-. .gitlab-ci/build-renderdoc.sh
+. .gitlab-ci/container/build-renderdoc.sh
############### Build libdrm
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
############### Uninstall the build software
############### Build piglit
-PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/build-piglit.sh
+PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh
############### Build dEQP runner (and install rust temporarily for it)
-. .gitlab-ci/build-rust.sh
-. .gitlab-ci/build-deqp-runner.sh
+. .gitlab-ci/container/build-rust.sh
+. .gitlab-ci/container/build-deqp-runner.sh
rm -rf /root/.rustup /root/.cargo
############### Build Fossilize
-. .gitlab-ci/build-fossilize.sh
+. .gitlab-ci/container/build-fossilize.sh
############### Build dEQP VK
-. .gitlab-ci/build-deqp.sh
+. .gitlab-ci/container/build-deqp.sh
############### Build gfxreconstruct
-. .gitlab-ci/build-gfxreconstruct.sh
+. .gitlab-ci/container/build-gfxreconstruct.sh
############### Build VulkanTools
-. .gitlab-ci/build-vulkantools.sh
+. .gitlab-ci/container/build-vulkantools.sh
############### Uninstall the build software
variables:
- DISTRIBUTION_TAG: "2021-02-01-runner"
+ DISTRIBUTION_TAG: "2021-02-08-subdir-move"
.kernel+rootfs:
stage: container-2