ci: Add debian/ prefix to job names for Debian based docker images

And move the image build scripts to a subdirectory correspondingly.

Preparation for adding images based on other OSs.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11412>
This commit is contained in:
Michel Dänzer 2021-06-15 17:42:22 +02:00 committed by Marge Bot
parent 55caa3abb1
commit df185ae030
16 changed files with 105 additions and 105 deletions

View File

@ -285,7 +285,7 @@ success:
- when: never
variables:
FDO_DISTRIBUTION_VERSION: bullseye-slim
FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME"
FDO_REPO_SUFFIX: $CI_JOB_NAME
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
# no need to pull the whole repo to build the container image
GIT_STRATEGY: none
@ -299,158 +299,158 @@ success:
stage: container-2
# Debian 11 based x86 build image base
x86_build-base:
debian/x86_build-base:
extends:
- .fdo.container-build@debian
- .container
variables:
MESA_IMAGE_TAG: &x86_build-base "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-x86_build-base "2021-07-02-bump-libdrm"
.use-x86_build-base:
.use-debian/x86_build-base:
extends:
- .fdo.container-build@debian
- .use-base-image
variables:
MESA_BASE_IMAGE: "debian/x86_build-base"
MESA_BASE_TAG: *x86_build-base
MESA_ARTIFACTS_BASE_TAG: *x86_build-base
MESA_BASE_TAG: *debian-x86_build-base
MESA_ARTIFACTS_BASE_TAG: *debian-x86_build-base
needs:
- x86_build-base
- debian/x86_build-base
# Debian 11 based x86 main build image
x86_build:
debian/x86_build:
extends:
- .use-x86_build-base
- .use-debian/x86_build-base
variables:
MESA_IMAGE_TAG: &x86_build "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-x86_build "2021-07-02-bump-libdrm"
.use-x86_build:
.use-debian/x86_build:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *x86_build-base
MESA_BASE_TAG: *debian-x86_build-base
MESA_IMAGE_PATH: "debian/x86_build"
MESA_IMAGE_TAG: *x86_build
MESA_IMAGE_TAG: *debian-x86_build
needs:
- x86_build
- debian/x86_build
# Debian 11 based i386 cross-build image
i386_build:
debian/i386_build:
extends:
- .use-x86_build-base
- .use-debian/x86_build-base
variables:
MESA_IMAGE_TAG: &i386_build "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-i386_build "2021-07-02-bump-libdrm"
.use-i386_build:
.use-debian/i386_build:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *x86_build-base
MESA_BASE_TAG: *debian-x86_build-base
MESA_IMAGE_PATH: "debian/i386_build"
MESA_IMAGE_TAG: *i386_build
MESA_IMAGE_TAG: *debian-i386_build
needs:
- i386_build
- debian/i386_build
# Debian 11 based ppc64el cross-build image
ppc64el_build:
debian/ppc64el_build:
extends:
- .use-x86_build-base
- .use-debian/x86_build-base
variables:
MESA_IMAGE_TAG: &ppc64el_build "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-ppc64el_build "2021-07-02-bump-libdrm"
.use-ppc64el_build:
.use-debian/ppc64el_build:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *x86_build-base
MESA_BASE_TAG: *debian-x86_build-base
MESA_IMAGE_PATH: "debian/ppc64el_build"
MESA_IMAGE_TAG: *ppc64el_build
MESA_IMAGE_TAG: *debian-ppc64el_build
needs:
- ppc64el_build
- debian/ppc64el_build
# Debian 11 based s390x cross-build image
s390x_build:
debian/s390x_build:
extends:
- .use-x86_build-base
- .use-debian/x86_build-base
variables:
MESA_IMAGE_TAG: &s390x_build "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-s390x_build "2021-07-02-bump-libdrm"
.use-s390x_build:
.use-debian/s390x_build:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *x86_build-base
MESA_BASE_TAG: *debian-x86_build-base
MESA_IMAGE_PATH: "debian/s390x_build"
MESA_IMAGE_TAG: *s390x_build
MESA_IMAGE_TAG: *debian-s390x_build
needs:
- s390x_build
- debian/s390x_build
# Android NDK cross-build image
android_build:
debian/android_build:
extends:
- .use-x86_build-base
- .use-debian/x86_build-base
variables:
MESA_IMAGE_TAG: &android_build "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-android_build "2021-07-02-bump-libdrm"
.use-android_build:
.use-debian/android_build:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *x86_build-base
MESA_BASE_TAG: *debian-x86_build-base
MESA_IMAGE_PATH: "debian/android_build"
MESA_IMAGE_TAG: *android_build
MESA_IMAGE_TAG: *debian-android_build
needs:
- android_build
- debian/android_build
# Debian 11 based x86 test image base
x86_test-base:
extends: x86_build-base
debian/x86_test-base:
extends: debian/x86_build-base
variables:
MESA_IMAGE_TAG: &x86_test-base "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-x86_test-base "2021-07-02-bump-libdrm"
.use-x86_test-base:
.use-debian/x86_test-base:
extends:
- .fdo.container-build@debian
- .use-base-image
variables:
MESA_BASE_IMAGE: "debian/x86_test-base"
MESA_BASE_TAG: *x86_test-base
MESA_BASE_TAG: *debian-x86_test-base
needs:
- x86_test-base
- debian/x86_test-base
# Debian 11 based x86 test image for GL
x86_test-gl:
extends: .use-x86_test-base
debian/x86_test-gl:
extends: .use-debian/x86_test-base
variables:
FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc5-for-mesa-ci-27df41f1e0cf/linux-v5.13-rc5-for-mesa-ci-27df41f1e0cf.tar.bz2"
MESA_IMAGE_TAG: &x86_test-gl "2021-07-06-latest-virglrenderer"
MESA_IMAGE_TAG: &debian-x86_test-gl "2021-07-06-latest-virglrenderer"
# Debian 11 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
debian/x86_test-vk:
extends: .use-debian/x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-vk "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-x86_test-vk "2021-07-02-bump-libdrm"
# Debian 11 based ARM build image
arm_build:
debian/arm_build:
extends:
- .fdo.container-build@debian
- .container
tags:
- aarch64
variables:
MESA_IMAGE_TAG: &arm_build "2021-07-02-bump-libdrm"
MESA_IMAGE_TAG: &debian-arm_build "2021-07-02-bump-libdrm"
.use-arm_build:
.use-debian/arm_build:
extends:
- .set-image
variables:
MESA_IMAGE_PATH: "debian/arm_build"
MESA_IMAGE_TAG: *arm_build
MESA_ARTIFACTS_TAG: *arm_build
MESA_IMAGE_TAG: *debian-arm_build
MESA_ARTIFACTS_TAG: *debian-arm_build
needs:
- arm_build
- debian/arm_build
.kernel+rootfs:
extends:
@ -466,7 +466,7 @@ arm_build:
kernel+rootfs_amd64:
extends:
- .use-x86_build-base
- .use-debian/x86_build-base
- .kernel+rootfs
image: "$FDO_BASE_IMAGE"
variables:
@ -475,7 +475,7 @@ kernel+rootfs_amd64:
kernel+rootfs_arm64:
extends:
- .use-arm_build
- .use-debian/arm_build
- .kernel+rootfs
tags:
- aarch64
@ -500,7 +500,7 @@ kernel+rootfs_armhf:
MESA_ROOTFS_TAG: *kernel-rootfs
# x86 image with ARM64 & armhf kernel & rootfs for baremetal testing
arm_test:
debian/arm_test:
extends:
- .fdo.container-build@debian
- .container
@ -513,19 +513,19 @@ arm_test:
variables:
FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
MESA_ARM_BUILD_TAG: *arm_build
MESA_IMAGE_TAG: &arm_test "2021-07-02-bump-libdrm"
MESA_ARM_BUILD_TAG: *debian-arm_build
MESA_IMAGE_TAG: &debian-arm_test "2021-07-02-bump-libdrm"
MESA_ROOTFS_TAG: *kernel-rootfs
.use-arm_test:
.use-debian/arm_test:
image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
variables:
MESA_ARM_BUILD_TAG: *arm_build
MESA_ARM_BUILD_TAG: *debian-arm_build
MESA_IMAGE_PATH: "debian/arm_test"
MESA_IMAGE_TAG: *arm_test
MESA_IMAGE_TAG: *debian-arm_test
MESA_ROOTFS_TAG: *kernel-rootfs
needs:
- arm_test
- debian/arm_test
# Native Windows docker builds
#
@ -659,7 +659,7 @@ sanity:
.meson-build:
extends:
- .build-linux
- .use-x86_build
- .use-debian/x86_build
stage: meson-x86_64
variables:
LLVM_VERSION: 11
@ -783,7 +783,7 @@ meson-release:
meson-android:
extends:
- .meson-cross
- .use-android_build
- .use-debian/android_build
variables:
UNWIND: "disabled"
C_ARGS: >
@ -854,9 +854,9 @@ meson-android:
.meson-arm:
extends:
- .meson-cross
- .use-arm_build
- .use-debian/arm_build
needs:
- arm_build
- debian/arm_build
variables:
VULKAN_DRIVERS: freedreno,broadcom
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4"
@ -1056,7 +1056,7 @@ meson-vulkan:
meson-i386:
extends:
- .meson-cross
- .use-i386_build
- .use-debian/i386_build
variables:
CROSS: i386
VULKAN_DRIVERS: intel,amd,swrast,virtio-experimental
@ -1068,7 +1068,7 @@ meson-i386:
meson-s390x:
extends:
- meson-ppc64el
- .use-s390x_build
- .use-debian/s390x_build
- .s390x-rules
tags:
- kvm
@ -1082,7 +1082,7 @@ meson-s390x:
meson-ppc64el:
extends:
- .meson-cross
- .use-ppc64el_build
- .use-debian/ppc64el_build
- .ppc64el-rules
variables:
CROSS: ppc64el
@ -1124,22 +1124,22 @@ meson-mingw32-x86_64:
paths:
- results/
.use-x86_test-gl:
.use-debian/x86_test-gl:
extends:
- .test
- .set-image-base-tag
variables:
MESA_BASE_TAG: *x86_test-base
MESA_BASE_TAG: *debian-x86_test-base
MESA_IMAGE_PATH: "debian/x86_test-gl"
MESA_IMAGE_TAG: *x86_test-gl
MESA_IMAGE_TAG: *debian-x86_test-gl
needs:
- x86_test-gl
- debian/x86_test-gl
.test-gl:
extends:
- .use-x86_test-gl
- .use-debian/x86_test-gl
needs:
- x86_test-gl
- debian/x86_test-gl
- meson-testing
.test-vk:
@ -1147,18 +1147,18 @@ meson-mingw32-x86_64:
- .test
- .set-image-base-tag
variables:
MESA_BASE_TAG: *x86_test-base
MESA_BASE_TAG: *debian-x86_test-base
MESA_IMAGE_PATH: "debian/x86_test-vk"
MESA_IMAGE_TAG: *x86_test-vk
MESA_IMAGE_TAG: *debian-x86_test-vk
needs:
- meson-testing
- x86_test-vk
- debian/x86_test-vk
.test-cl:
extends:
- .use-x86_test-gl
- .use-debian/x86_test-gl
needs:
- x86_test-gl
- debian/x86_test-gl
- meson-clover-testing
.vkd3d-proton-test:
@ -1288,7 +1288,7 @@ meson-mingw32-x86_64:
TEST_LD_PRELOAD: libasan.so.6
MINIO_ARTIFACT_NAME: mesa-arm64-asan
needs:
- arm_test
- debian/arm_test
- job: meson-arm64-asan
artifacts: false

View File

@ -39,13 +39,13 @@
BOOT_METHOD: u-boot
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
extends:
- .use-arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_armhf
- .use-x86_build
- .use-debian/arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_armhf
- .use-debian/x86_build
- .lava-test
- .use-kernel+rootfs-arm
needs:
- kernel+rootfs_armhf
- x86_build
- debian/x86_build
- meson-armhf
.lava-test:arm64:
@ -56,15 +56,15 @@
BOOT_METHOD: u-boot
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
extends:
- .use-arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm64
- .use-x86_build
- .use-debian/arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm64
- .use-debian/x86_build
- .lava-test
- .use-kernel+rootfs-arm
dependencies:
- meson-arm64
needs:
- kernel+rootfs_arm64
- x86_build
- debian/x86_build
- meson-arm64
.lava-test:amd64:
@ -75,8 +75,8 @@
BOOT_METHOD: u-boot
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
extends:
- .use-x86_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_amd64
- .use-x86_build
- .use-debian/x86_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_amd64
- .use-debian/x86_build
- .lava-test
- .use-kernel+rootfs-amd64
needs:

View File

@ -2,7 +2,7 @@
extends:
- .baremetal-test-armhf
- .vc4-rules
- .use-arm_test
- .use-debian/arm_test
variables:
BM_BOOTFS: /boot/raspberrypi_armhf
BM_ROOTFS: /rootfs-armhf
@ -13,7 +13,7 @@
script:
- ./install/bare-metal/poe-powered.sh
needs:
- job: arm_test
- job: debian/arm_test
artifacts: false
- meson-armhf
tags:
@ -79,7 +79,7 @@ vc4-rpi3-piglit-quick_shader:armhf:
extends:
- .baremetal-test-armhf
- .v3d-rules
- .use-arm_test
- .use-debian/arm_test
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
BM_BOOTFS: /boot/raspberrypi_armhf
@ -92,7 +92,7 @@ vc4-rpi3-piglit-quick_shader:armhf:
script:
- ./install/bare-metal/poe-powered.sh
needs:
- arm_test
- debian/arm_test
- meson-armhf
tags:
- igalia-rpi4
@ -156,7 +156,7 @@ v3d-rpi4-piglit:armhf:
v3dv-rpi4-vk:arm64:
extends:
- .baremetal-test
- .use-arm_test
- .use-debian/arm_test
- .v3dv-rules
parallel: 6
variables:
@ -175,7 +175,7 @@ v3dv-rpi4-vk:arm64:
script:
- ./install/bare-metal/poe-powered.sh
needs:
- arm_test
- debian/arm_test
- job: meson-arm64
artifacts: false
tags:

View File

@ -1,7 +1,7 @@
.freedreno-test:
extends:
- .baremetal-test
- .use-arm_test
- .use-debian/arm_test
- .freedreno-rules
variables:
MINIO_ARTIFACT_NAME: mesa-arm64
@ -12,7 +12,7 @@
script:
- ./install/bare-metal/fastboot.sh
needs:
- arm_test
- debian/arm_test
- job: meson-arm64
artifacts: false
tags:

View File

@ -42,7 +42,7 @@ softpipe-asan-gles31:
TEST_LD_PRELOAD: libasan.so.6
extends: softpipe-gles2
needs:
- x86_test-gl
- debian/x86_test-gl
- meson-testing-asan
softpipe-piglit-quick: