ci: rename x86 and amd64 to x86_64, armhf to arm32, and i386 to x86_32

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8049

Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23282>
This commit is contained in:
David Heidelberg 2023-05-26 19:10:57 +02:00
parent 653a374126
commit 5140ff1948
37 changed files with 269 additions and 269 deletions

View File

@ -49,7 +49,7 @@
.meson-build:
extends:
- .build-linux
- .use-debian/x86_build
- .use-debian/x86_64_build
stage: build-x86_64
variables:
LLVM_VERSION: 15
@ -59,7 +59,7 @@
.meson-build_mingw:
extends:
- .build-linux
- .use-debian/x86_build_mingw
- .use-debian/x86_64_build_mingw
- .use-wine
stage: build-x86_64
script:
@ -244,7 +244,7 @@ debian-release:
alpine-build-testing:
extends:
- .meson-build
- .use-alpine/x86_build
- .use-alpine/x86_64_build
stage: build-x86_64
variables:
BUILDTYPE: "release"
@ -282,7 +282,7 @@ alpine-build-testing:
fedora-release:
extends:
- .meson-build
- .use-fedora/x86_build
- .use-fedora/x86_64_build
variables:
BUILDTYPE: "release"
C_LINK_ARGS: >
@ -406,9 +406,9 @@ debian-android:
.meson-arm:
extends:
- .meson-cross
- .use-debian/arm_build
- .use-debian/arm64_build
needs:
- debian/arm_build
- debian/arm64_build
variables:
VULKAN_DRIVERS: freedreno,broadcom
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4,zink"
@ -416,7 +416,7 @@ debian-android:
tags:
- aarch64
debian-armhf:
debian-arm32:
extends:
- .meson-arm
- .ci-deqp-artifacts
@ -425,7 +425,7 @@ debian-armhf:
EXTRA_OPTION: >
-D llvm=disabled
-D valgrind=disabled
MINIO_ARTIFACT_NAME: mesa-armhf
MINIO_ARTIFACT_NAME: mesa-arm32
# The strip command segfaults, failing to strip the binary and leaving
# tempfiles in our artifacts.
ARTIFACTS_DEBUG_SYMBOLS: 1
@ -636,10 +636,10 @@ debian-vulkan:
-D intel-clc=disabled
-D imagination-srv=true
debian-i386:
debian-x86_32:
extends:
- .meson-cross
- .use-debian/i386_build
- .use-debian/x86_32_build
variables:
CROSS: i386
VULKAN_DRIVERS: intel,amd,swrast,virtio

View File

@ -1,9 +1,9 @@
#!/bin/bash
#!/usr/bin/env bash
set -e
set -o xtrace
# Fetch the arm-built rootfs image and unpack it in our x86 container (saves
# Fetch the arm-built rootfs image and unpack it in our x86_64 container (saves
# network transfer, disk usage, and runtime on test jobs)
# shellcheck disable=SC2154 # arch is assigned in previous scripts

View File

@ -3,9 +3,9 @@
# When changing this file, you need to bump the following
# .gitlab-ci/image-tags.yml tags:
# DEBIAN_X86_TEST_ANDROID_TAG
# DEBIAN_X86_TEST_GL_TAG
# DEBIAN_X86_TEST_VK_TAG
# DEBIAN_X86_64_TEST_ANDROID_TAG
# DEBIAN_X86_64_TEST_GL_TAG
# DEBIAN_X86_64_TEST_VK_TAG
# KERNEL_ROOTFS_TAG
set -ex

View File

@ -2,7 +2,7 @@
# When changing this file, you need to bump the following
# .gitlab-ci/image-tags.yml tags:
# DEBIAN_X86_TEST_VK_TAG
# DEBIAN_X86_64_TEST_VK_TAG
# KERNEL_ROOTFS_TAG
set -ex

View File

@ -2,7 +2,7 @@
# When changing this file, you need to bump the following
# .gitlab-ci/image-tags.yml tags:
# DEBIAN_X86_TEST_GL_TAG
# DEBIAN_X86_64_TEST_GL_TAG
# KERNEL_ROOTFS_TAG:
set -ex

View File

@ -81,7 +81,7 @@ pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedeskt
. .gitlab-ci/container/build-rust.sh
. .gitlab-ci/container/debian/x86_build-base-wine.sh
. .gitlab-ci/container/debian/x86_64_build-base-wine.sh
############### Uninstall ephemeral packages

View File

@ -9,5 +9,5 @@ apt-get install -y --no-remove \
g++-mingw-w64-i686 \
g++-mingw-w64-x86-64
. .gitlab-ci/container/debian/x86_build-mingw-patch.sh
. .gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
. .gitlab-ci/container/debian/x86_64_build-mingw-patch.sh
. .gitlab-ci/container/debian/x86_64_build-mingw-source-deps.sh

View File

@ -64,81 +64,81 @@
# Don't want the .container rules
- .build-rules
# Debian based x86 build image base
debian/x86_build-base:
# Debian based x86_64 build image base
debian/x86_64_build-base:
extends:
- .fdo.container-build@debian
- .container
variables:
MESA_IMAGE_TAG: &debian-x86_build-base ${DEBIAN_BASE_TAG}
MESA_IMAGE_TAG: &debian-x86_64_build-base ${DEBIAN_BASE_TAG}
.use-debian/x86_build-base:
.use-debian/x86_64_build-base:
extends:
- .fdo.container-build@debian
- .use-base-image
variables:
MESA_BASE_IMAGE: ${DEBIAN_X86_BUILD_BASE_IMAGE}
MESA_BASE_TAG: *debian-x86_build-base
MESA_ARTIFACTS_BASE_TAG: *debian-x86_build-base
MESA_BASE_IMAGE: ${DEBIAN_X86_64_BUILD_BASE_IMAGE}
MESA_BASE_TAG: *debian-x86_64_build-base
MESA_ARTIFACTS_BASE_TAG: *debian-x86_64_build-base
needs:
- debian/x86_build-base
- debian/x86_64_build-base
# Debian based x86 main build image
debian/x86_build:
# Debian based x86_64 main build image
debian/x86_64_build:
extends:
- .use-debian/x86_build-base
- .use-debian/x86_64_build-base
variables:
MESA_IMAGE_TAG: &debian-x86_build ${DEBIAN_BUILD_TAG}
MESA_IMAGE_TAG: &debian-x86_64_build ${DEBIAN_BUILD_TAG}
.use-debian/x86_build:
.use-debian/x86_64_build:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *debian-x86_build-base
MESA_IMAGE_PATH: ${DEBIAN_X86_BUILD_IMAGE_PATH}
MESA_IMAGE_TAG: *debian-x86_build
MESA_BASE_TAG: *debian-x86_64_build-base
MESA_IMAGE_PATH: ${DEBIAN_X86_64_BUILD_IMAGE_PATH}
MESA_IMAGE_TAG: *debian-x86_64_build
needs:
- debian/x86_build
- debian/x86_64_build
# Debian based i386 cross-build image
debian/i386_build:
# Debian based x86_32 cross-build image
debian/x86_32_build:
extends:
- .use-debian/x86_build-base
- .use-debian/x86_64_build-base
variables:
MESA_IMAGE_TAG: &debian-i386_build ${DEBIAN_BUILD_TAG}
MESA_IMAGE_TAG: &debian-x86_32_build ${DEBIAN_BUILD_TAG}
.use-debian/i386_build:
.use-debian/x86_32_build:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *debian-x86_build-base
MESA_IMAGE_PATH: "debian/i386_build"
MESA_IMAGE_TAG: *debian-i386_build
MESA_BASE_TAG: *debian-x86_64_build-base
MESA_IMAGE_PATH: "debian/x86_32_build"
MESA_IMAGE_TAG: *debian-x86_32_build
needs:
- debian/i386_build
- debian/x86_32_build
# Debian based x86-mingw cross main build image
# Debian based x86_64-mingw cross main build image
# FIXME: Until gets fixed on Debian 12, disabled.
.debian/x86_build-mingw:
.debian/x86_64_build-mingw:
extends:
- .use-debian/x86_build-base
- .use-debian/x86_64_build-base
variables:
MESA_IMAGE_TAG: &debian-x86_build_mingw ${DEBIAN_BUILD_MINGW_TAG}
MESA_IMAGE_TAG: &debian-x86_64_build_mingw ${DEBIAN_BUILD_MINGW_TAG}
.use-debian/x86_build_mingw:
.use-debian/x86_64_build_mingw:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *debian-x86_build-base
MESA_IMAGE_PATH: ${DEBIAN_X86_BUILD_MINGW_IMAGE_PATH}
MESA_IMAGE_TAG: *debian-x86_build_mingw
MESA_BASE_TAG: *debian-x86_64_build-base
MESA_IMAGE_PATH: ${DEBIAN_X86_64_BUILD_MINGW_IMAGE_PATH}
MESA_IMAGE_TAG: *debian-x86_64_build_mingw
needs:
- .debian/x86_build-mingw
- .debian/x86_64_build-mingw
# Debian based ppc64el cross-build image
debian/ppc64el_build:
extends:
- .use-debian/x86_build-base
- .use-debian/x86_64_build-base
variables:
MESA_IMAGE_TAG: &debian-ppc64el_build ${DEBIAN_BUILD_TAG}
@ -146,7 +146,7 @@ debian/ppc64el_build:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *debian-x86_build-base
MESA_BASE_TAG: *debian-x86_64_build-base
MESA_IMAGE_PATH: "debian/ppc64el_build"
MESA_IMAGE_TAG: *debian-ppc64el_build
needs:
@ -155,7 +155,7 @@ debian/ppc64el_build:
# Debian based s390x cross-build image
debian/s390x_build:
extends:
- .use-debian/x86_build-base
- .use-debian/x86_64_build-base
variables:
MESA_IMAGE_TAG: &debian-s390x_build ${DEBIAN_BUILD_TAG}
@ -163,7 +163,7 @@ debian/s390x_build:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *debian-x86_build-base
MESA_BASE_TAG: *debian-x86_64_build-base
MESA_IMAGE_PATH: "debian/s390x_build"
MESA_IMAGE_TAG: *debian-s390x_build
needs:
@ -172,7 +172,7 @@ debian/s390x_build:
# Android NDK cross-build image
debian/android_build:
extends:
- .use-debian/x86_build-base
- .use-debian/x86_64_build-base
variables:
MESA_IMAGE_TAG: &debian-android_build ${DEBIAN_BUILD_TAG}
ANDROID_SDK_VERSION: 33
@ -182,134 +182,134 @@ debian/android_build:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *debian-x86_build-base
MESA_BASE_TAG: *debian-x86_64_build-base
MESA_IMAGE_PATH: "debian/android_build"
MESA_IMAGE_TAG: *debian-android_build
needs:
- debian/android_build
# Debian based x86 test image base
debian/x86_test-base:
extends: debian/x86_build-base
# Debian based x86_64 test image base
debian/x86_64_test-base:
extends: debian/x86_64_build-base
variables:
KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v6.3-for-mesa-ci-43c973a8ff91/linux-v6.3-for-mesa-ci-6fc749a2a59a.tar.bz2"
MESA_IMAGE_TAG: &debian-x86_test-base ${DEBIAN_BASE_TAG}
MESA_IMAGE_TAG: &debian-x86_64_test-base ${DEBIAN_BASE_TAG}
.use-debian/x86_test-base:
.use-debian/x86_64_test-base:
extends:
- .fdo.container-build@debian
- .use-base-image
variables:
MESA_BASE_IMAGE: ${DEBIAN_X86_TEST_BASE_IMAGE}
MESA_BASE_TAG: *debian-x86_test-base
MESA_BASE_IMAGE: ${DEBIAN_X86_64_TEST_BASE_IMAGE}
MESA_BASE_TAG: *debian-x86_64_test-base
needs:
- debian/x86_test-base
- debian/x86_64_test-base
# Debian based x86 test image for GL
debian/x86_test-gl:
extends: .use-debian/x86_test-base
# Debian based x86_64 test image for GL
debian/x86_64_test-gl:
extends: .use-debian/x86_64_test-base
variables:
MESA_IMAGE_TAG: &debian-x86_test-gl ${DEBIAN_X86_TEST_GL_TAG}
MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_X86_64_TEST_GL_TAG}
.use-debian/x86_test-gl:
.use-debian/x86_64_test-gl:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *debian-x86_test-base
MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH}
MESA_IMAGE_TAG: *debian-x86_test-gl
MESA_BASE_TAG: *debian-x86_64_test-base
MESA_IMAGE_PATH: ${DEBIAN_X86_64_TEST_IMAGE_GL_PATH}
MESA_IMAGE_TAG: *debian-x86_64_test-gl
needs:
- debian/x86_test-gl
- debian/x86_64_test-gl
# Debian based x86 test image for VK
debian/x86_test-vk:
extends: .use-debian/x86_test-base
# Debian based x86_64 test image for VK
debian/x86_64_test-vk:
extends: .use-debian/x86_64_test-base
variables:
MESA_IMAGE_TAG: &debian-x86_test-vk ${DEBIAN_X86_TEST_VK_TAG}
MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_X86_64_TEST_VK_TAG}
.use-debian/x86_test-vk:
.use-debian/x86_64_test-vk:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *debian-x86_test-base
MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_VK_PATH}
MESA_IMAGE_TAG: *debian-x86_test-vk
MESA_BASE_TAG: *debian-x86_64_test-base
MESA_IMAGE_PATH: ${DEBIAN_X86_64_TEST_IMAGE_VK_PATH}
MESA_IMAGE_TAG: *debian-x86_64_test-vk
needs:
- debian/x86_test-vk
- debian/x86_64_test-vk
# Debian based x86 test image for Android
debian/x86_test-android:
extends: .use-debian/x86_test-base
# Debian based x86_64 test image for Android
debian/x86_64_test-android:
extends: .use-debian/x86_64_test-base
variables:
MESA_IMAGE_TAG: &debian-x86_test-android ${DEBIAN_X86_TEST_ANDROID_TAG}
MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_X86_64_TEST_ANDROID_TAG}
ANDROID_NDK: android-ndk-r25b
.use-debian/x86_test-android:
.use-debian/x86_64_test-android:
extends:
- .set-image-base-tag
variables:
MESA_BASE_TAG: *debian-x86_test-base
MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_ANDROID_IMAGE_PATH}
MESA_IMAGE_TAG: *debian-x86_test-android
MESA_BASE_TAG: *debian-x86_64_test-base
MESA_IMAGE_PATH: ${DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH}
MESA_IMAGE_TAG: *debian-x86_64_test-android
needs:
- debian/x86_test-android
- debian/x86_64_test-android
# Debian based ARM build image
debian/arm_build:
debian/arm64_build:
extends:
- .fdo.container-build@debian
- .container
tags:
- aarch64
variables:
MESA_IMAGE_TAG: &debian-arm_build ${DEBIAN_BASE_TAG}
MESA_IMAGE_TAG: &debian-arm64_build ${DEBIAN_BASE_TAG}
.use-debian/arm_build:
.use-debian/arm64_build:
extends:
- .set-image
variables:
MESA_IMAGE_PATH: "debian/arm_build"
MESA_IMAGE_TAG: *debian-arm_build
MESA_ARTIFACTS_TAG: *debian-arm_build
MESA_IMAGE_PATH: "debian/arm64_build"
MESA_IMAGE_TAG: *debian-arm64_build
MESA_ARTIFACTS_TAG: *debian-arm64_build
needs:
- debian/arm_build
- debian/arm64_build
# Alpine based x86 build image
alpine/x86_build:
# Alpine based x86_64 build image
alpine/x86_64_build:
extends:
- .fdo.container-build@alpine
- .container
variables:
FDO_DISTRIBUTION_VERSION: "3.18"
MESA_IMAGE_TAG: &alpine-x86_build ${ALPINE_X86_BUILD_TAG}
MESA_IMAGE_TAG: &alpine-x86_64_build ${ALPINE_X86_64_BUILD_TAG}
.use-alpine/x86_build:
.use-alpine/x86_64_build:
extends:
- .set-image
variables:
MESA_IMAGE_PATH: "alpine/x86_build"
MESA_IMAGE_TAG: *alpine-x86_build
MESA_IMAGE_PATH: "alpine/x86_64_build"
MESA_IMAGE_TAG: *alpine-x86_64_build
needs:
- alpine/x86_build
- alpine/x86_64_build
# Fedora based x86 build image
fedora/x86_build:
# Fedora based x86_64 build image
fedora/x86_64_build:
extends:
- .fdo.container-build@fedora
- .container
variables:
FDO_DISTRIBUTION_VERSION: 38
MESA_IMAGE_TAG: &fedora-x86_build ${FEDORA_X86_BUILD_TAG}
MESA_IMAGE_TAG: &fedora-x86_64_build ${FEDORA_X86_64_BUILD_TAG}
.use-fedora/x86_build:
.use-fedora/x86_64_build:
extends:
- .set-image
variables:
MESA_IMAGE_PATH: "fedora/x86_build"
MESA_IMAGE_TAG: *fedora-x86_build
MESA_IMAGE_PATH: "fedora/x86_64_build"
MESA_IMAGE_TAG: *fedora-x86_64_build
needs:
- fedora/x86_build
- fedora/x86_64_build
.kernel+rootfs:
@ -324,25 +324,25 @@ fedora/x86_build:
script:
- .gitlab-ci/container/lava_build.sh
kernel+rootfs_amd64:
kernel+rootfs_x86_64:
extends:
- .use-debian/x86_build-base
- .use-debian/x86_64_build-base
- .kernel+rootfs
image: "$FDO_BASE_IMAGE"
variables:
DEBIAN_ARCH: "amd64"
DISTRIBUTION_TAG: &distribution-tag-amd64 "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
DISTRIBUTION_TAG: &distribution-tag-x86_64 "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
kernel+rootfs_arm64:
extends:
- .use-debian/arm_build
- .use-debian/arm64_build
- .kernel+rootfs
tags:
- aarch64
variables:
DEBIAN_ARCH: "arm64"
kernel+rootfs_armhf:
kernel+rootfs_arm32:
extends:
- kernel+rootfs_arm64
variables:
@ -354,12 +354,12 @@ kernel+rootfs_armhf:
DISTRIBUTION_TAG: *distribution-tag-arm
MESA_ROOTFS_TAG: *kernel-rootfs
.use-kernel+rootfs-amd64:
.use-kernel+rootfs-x86_64:
variables:
DISTRIBUTION_TAG: *distribution-tag-amd64
DISTRIBUTION_TAG: *distribution-tag-x86_64
MESA_ROOTFS_TAG: *kernel-rootfs
# x86 image with ARM64 & armhf kernel & rootfs for baremetal testing
# x86_64 image with ARM64 & ARM32 kernel & rootfs for baremetal testing
.debian/arm_test:
extends:
- .fdo.container-build@debian
@ -370,16 +370,16 @@ kernel+rootfs_armhf:
FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava"
ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
MESA_ARTIFACTS_TAG: *debian-arm_build
MESA_ARTIFACTS_TAG: *debian-arm64_build
MESA_ROOTFS_TAG: *kernel-rootfs
debian/armhf_test:
debian/arm32_test:
extends:
- .debian/arm_test
needs:
- kernel+rootfs_armhf
- kernel+rootfs_arm32
variables:
MESA_IMAGE_TAG: &debian-armhf_test ${DEBIAN_BASE_TAG}
MESA_IMAGE_TAG: &debian-arm32_test ${DEBIAN_BASE_TAG}
debian/arm64_test:
extends:
@ -393,13 +393,13 @@ debian/arm64_test:
variables:
MESA_ROOTFS_TAG: *kernel-rootfs
.use-debian/armhf_test:
.use-debian/arm32_test:
image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
extends:
- .use-debian/arm_test
variables:
MESA_IMAGE_PATH: "debian/armhf_test"
MESA_IMAGE_TAG: *debian-armhf_test
MESA_IMAGE_PATH: "debian/arm32_test"
MESA_IMAGE_TAG: *debian-arm32_test
needs:
- debian/arm_test

View File

@ -1,26 +1,26 @@
variables:
DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "2023-05-25-virglrenderer"
DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "2023-05-25-bookworm"
DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
DEBIAN_X86_64_BUILD_MINGW_IMAGE_PATH: "debian/x86_64_build-mingw"
DEBIAN_BUILD_MINGW_TAG: "2023-05-25-bookworm"
DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
DEBIAN_X86_TEST_IMAGE_GL_PATH: "debian/x86_test-gl"
DEBIAN_X86_TEST_IMAGE_VK_PATH: "debian/x86_test-vk"
DEBIAN_X86_TEST_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH}
DEBIAN_X86_TEST_ANDROID_IMAGE_PATH: "debian/x86_test-android"
DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl"
DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk"
DEBIAN_X86_64_TEST_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH}
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
DEBIAN_X86_TEST_ANDROID_TAG: "2023-05-25-bookworm"
DEBIAN_X86_TEST_GL_TAG: "2023-05-31-vvl"
DEBIAN_X86_TEST_VK_TAG: "2023-05-25-vkd3d-proton"
DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-05-25-bookworm"
DEBIAN_X86_64_TEST_GL_TAG: "2023-05-31-vvl"
DEBIAN_X86_64_TEST_VK_TAG: "2023-05-25-vkd3d-proton"
ALPINE_X86_BUILD_TAG: "2023-05-01-3.18-bump-1"
FEDORA_X86_BUILD_TAG: "2023-04-26-rusticl"
ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1"
FEDORA_X86_64_BUILD_TAG: "2023-04-26-rusticl"
KERNEL_ROOTFS_TAG: "2023-05-31-vvl"
WINDOWS_X64_VS_PATH: "windows/x64_vs"

View File

@ -33,25 +33,25 @@
after_script:
- curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s "https://${JOB_RESULTS_PATH}" | tar --zstd -x
.lava-test:armhf:
.lava-test:arm32:
variables:
ARCH: armhf
KERNEL_IMAGE_NAME: zImage
KERNEL_IMAGE_TYPE: "zimage"
BOOT_METHOD: u-boot
extends:
- .use-debian/arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_armhf
- .use-debian/x86_build
- .use-debian/arm64_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm32
- .use-debian/x86_64_build
- .lava-test
- .use-kernel+rootfs-arm
needs:
- kernel+rootfs_armhf
- debian/x86_build
- debian-armhf
- kernel+rootfs_arm32
- debian/x86_64_build
- debian-arm32
.lava-test-deqp:armhf:
.lava-test-deqp:arm32:
extends:
- .lava-test:armhf
- .lava-test:arm32
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
@ -62,15 +62,15 @@
KERNEL_IMAGE_TYPE: "image"
BOOT_METHOD: u-boot
extends:
- .use-debian/arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm64
- .use-debian/x86_build
- .use-debian/arm64_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm64
- .use-debian/x86_64_build
- .lava-test
- .use-kernel+rootfs-arm
dependencies:
- debian-arm64
needs:
- kernel+rootfs_arm64
- debian/x86_build
- debian/x86_64_build
- debian-arm64
.lava-test-deqp:arm64:
@ -79,26 +79,26 @@
extends:
- .lava-test:arm64
.lava-test:amd64:
.lava-test:x86_64:
variables:
ARCH: amd64
KERNEL_IMAGE_NAME: bzImage
KERNEL_IMAGE_TYPE: "zimage"
BOOT_METHOD: u-boot
extends:
- .use-debian/x86_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_amd64
- .use-debian/x86_build
- .use-debian/x86_64_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_x86_64
- .use-debian/x86_64_build
- .lava-test
- .use-kernel+rootfs-amd64
- .use-kernel+rootfs-x86_64
needs:
- kernel+rootfs_amd64
- kernel+rootfs_x86_64
- debian-testing
.lava-test-deqp:amd64:
.lava-test-deqp:x86_64:
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
extends:
- .lava-test:amd64
- .lava-test:x86_64
.lava-traces-base:
variables:
@ -113,15 +113,15 @@
PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}"
HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
.lava-piglit-traces:amd64:
.lava-piglit-traces:x86_64:
extends:
- .lava-test:amd64
- .lava-test:x86_64
- .lava-piglit
- .lava-traces-base
.lava-piglit-traces:armhf:
.lava-piglit-traces:arm32:
extends:
- .lava-test:armhf
- .lava-test:arm32
- .lava-piglit
- .lava-traces-base
@ -131,9 +131,9 @@
- .lava-piglit
- .lava-traces-base
.lava-piglit:amd64:
.lava-piglit:x86_64:
extends:
- .lava-test:amd64
- .lava-test:x86_64
- .lava-piglit
.lava-piglit:arm64:

View File

@ -114,11 +114,11 @@
- debian/arm64_test
- debian-arm64-release
.piglit-performance:amd64:
.piglit-performance:x86_64:
extends:
- .piglit-performance-base
needs:
- kernel+rootfs_amd64
- kernel+rootfs_x86_64
- debian-release
# Mesa source file dependencies that may impact any GL driver test job.
@ -697,9 +697,9 @@
allow_failure: true # see comment in .performance-rules, which we don't inherit this line from.
variables:
LAVA_JOB_PRIORITY: 40
MINIO_ARTIFACT_NAME: "mesa-amd64-release"
MINIO_ARTIFACT_NAME: "mesa-x86_64-release"
needs:
- kernel+rootfs_amd64
- kernel+rootfs_x86_64
- debian-release
.anv-rules:
@ -789,9 +789,9 @@
allow_failure: true # see comment in .performance-rules, which we don't inherit this line from.
variables:
LAVA_JOB_PRIORITY: 40
MINIO_ARTIFACT_NAME: "mesa-amd64-release"
MINIO_ARTIFACT_NAME: "mesa-x86_64-release"
needs:
- kernel+rootfs_amd64
- kernel+rootfs_x86_64
- debian-release
.zink-common-rules:

View File

@ -22,7 +22,7 @@ rustfmt:
interruptible: true
stage: lint
extends:
- .use-debian/x86_build
- .use-debian/x86_64_build
- .lint-rustfmt-rules
variables:
GIT_STRATEGY: fetch
@ -35,7 +35,7 @@ clang-format:
interruptible: true
stage: lint
extends:
- .use-debian/x86_build
- .use-debian/x86_64_build
- .lint-clang-format-rules
variables:
GIT_STRATEGY: fetch
@ -51,30 +51,30 @@ clang-format:
.test-gl:
extends:
- .test
- .use-debian/x86_test-gl
- .use-debian/x86_64_test-gl
needs:
- debian/x86_test-gl
- debian/x86_64_test-gl
- debian-testing
.test-vk:
extends:
- .test
- .use-debian/x86_test-vk
- .use-debian/x86_64_test-vk
needs:
- debian-testing
- debian/x86_test-vk
- debian/x86_64_test-vk
.test-cl:
extends:
- .test
- .use-debian/x86_test-gl
- .use-debian/x86_64_test-gl
needs:
- debian/x86_test-gl
- debian/x86_64_test-gl
.test-android:
extends:
- .test
- .use-debian/x86_test-android
- .use-debian/x86_64_test-android
variables:
MINIO_ARTIFACT_NAME: mesa-x86_64-android
needs:
@ -82,7 +82,7 @@ clang-format:
artifacts: true # On the host we want the Linux build
- job: debian-android
artifacts: false # The Android build will be downloaded later
- job: debian/x86_test-android
- job: debian/x86_64_test-android
artifacts: false
timeout: 20m
script:
@ -185,16 +185,16 @@ clang-format:
junit: results/junit.xml
# ARM testing of bare-metal boards attached to an x86 gitlab-runner system
.baremetal-test-armhf:
.baremetal-test-arm32:
extends:
- .baremetal-test
- .use-debian/armhf_test
- .use-debian/arm32_test
variables:
BM_ROOTFS: /rootfs-armhf
MINIO_ARTIFACT_NAME: mesa-armhf
MINIO_ARTIFACT_NAME: mesa-arm32
needs:
- debian/armhf_test
- job: debian-armhf
- debian/arm32_test
- job: debian-arm32
artifacts: false
# ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system
@ -234,7 +234,7 @@ clang-format:
# image:, but the integration is not possible for the current
# use-case. Within this job, two containers are managed. 1) the
# gitlab runner container from which the job is submitted to the
# DUT, and 2) the test container (e.g. debian/x86_test-vk) within
# DUT, and 2) the test container (e.g. debian/x86_64_test-vk) within
# which the test cases will run on the DUT. Since ci-templates and
# the associated image setting macros in this file rely on variables
# like FDO_DISTRIBUTION_TAG for *the* image, there is no way to
@ -372,16 +372,16 @@ clang-format:
.b2c-test-vk:
extends:
- .use-debian/x86_test-vk
- .use-debian/x86_64_test-vk
- .b2c-test
needs:
- debian/x86_test-vk
- debian/x86_64_test-vk
- debian-testing
.b2c-test-gl:
extends:
- .use-debian/x86_test-gl
- .use-debian/x86_64_test-gl
- .b2c-test
needs:
- debian/x86_test-gl
- debian/x86_64_test-gl
- debian-testing

View File

@ -1,6 +1,6 @@
############### LAVA
# job prefixes: radeonsi (OpenGL), radv (Vulkan), amd (radeonsi+radv)
.stoney-test:amd64:
.stoney-test:x86_64:
variables:
BOOT_METHOD: depthcharge
DEQP_EXPECTED_RENDERER: STONEY
@ -10,9 +10,9 @@
HWCI_KERNEL_MODULES: amdgpu
KERNEL_IMAGE_TYPE: ""
.radeonsi-stoney-test:amd64:
.radeonsi-stoney-test:x86_64:
extends:
- .stoney-test:amd64
- .stoney-test:x86_64
- .radeonsi-rules
variables:
GPU_VERSION: radeonsi-stoney
@ -22,9 +22,9 @@
DEVICE_TYPE: acer-R721T-grunt
PIGLIT_PLATFORM: mixed_glx_egl
.radv-stoney-test:amd64:
.radv-stoney-test:x86_64:
extends:
- .stoney-test:amd64
- .stoney-test:x86_64
- .radv-collabora-rules
variables:
DEQP_VER: vk
@ -36,34 +36,34 @@
RUNNER_TAG: mesa-ci-x86-64-lava-hp-14-db0003na-grunt
# Run five jobs in parallel each running 1/55th of the test suite
radv-stoney-vkcts:amd64:
radv-stoney-vkcts:x86_64:
extends:
- .lava-test-deqp:amd64
- .radv-stoney-test:amd64
- .lava-test-deqp:x86_64
- .radv-stoney-test:x86_64
parallel: 5
variables:
DEQP_FRACTION: 11
radeonsi-stoney-gl:amd64:
radeonsi-stoney-gl:x86_64:
extends:
- .lava-test-deqp:amd64
- .radeonsi-stoney-test:amd64
- .lava-test-deqp:x86_64
- .radeonsi-stoney-test:x86_64
parallel: 11
variables:
DEQP_SUITE: radeonsi-stoney
HWCI_START_XORG: 1
radeonsi-stoney-traces:amd64:
radeonsi-stoney-traces:x86_64:
extends:
- .lava-piglit-traces:amd64
- .radeonsi-stoney-test:amd64
- .lava-piglit-traces:x86_64
- .radeonsi-stoney-test:x86_64
variables:
EGL_PLATFORM: surfaceless
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-amd.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
# 10 devices (2023-01-17)
.lava-asus-CM1400CXA-dalboz:amd64:
.lava-asus-CM1400CXA-dalboz:x86_64:
variables:
BOOT_METHOD: depthcharge
DEVICE_TYPE: asus-CM1400CXA-dalboz
@ -74,7 +74,7 @@ radeonsi-stoney-traces:amd64:
RUNNER_TAG: mesa-ci-x86-64-lava-asus-CM1400CXA-dalboz
# 5 devices (2023-05-03)
.lava-lenovo-TPad-C13-Yoga-zork:amd64:
.lava-lenovo-TPad-C13-Yoga-zork:x86_64:
variables:
BOOT_METHOD: depthcharge
DEVICE_TYPE: lenovo-TPad-C13-Yoga-zork
@ -84,21 +84,21 @@ radeonsi-stoney-traces:amd64:
KERNEL_IMAGE_TYPE: ""
RUNNER_TAG: mesa-ci-x86-64-lava-lenovo-TPad-C13-Yoga-zork
.radeonsi-raven-test:amd64:
.radeonsi-raven-test:x86_64:
extends:
- .radeonsi-rules
variables:
GPU_VERSION: radeonsi-raven
DRIVER_NAME: radeonsi
.radv-raven-test:amd64:
.radv-raven-test:x86_64:
extends:
- .radv-collabora-rules
variables:
GPU_VERSION: radv-raven
VK_DRIVER: radeon
.amd-raven-test:amd64:
.amd-raven-test:x86_64:
extends:
- .radeonsi+radv-rules
variables:
@ -106,65 +106,65 @@ radeonsi-stoney-traces:amd64:
GPU_VERSION: amd-raven
VK_DRIVER: radeon
radv-raven-vkcts:amd64:
radv-raven-vkcts:x86_64:
extends:
- .lava-test-deqp:amd64
- .radv-raven-test:amd64
- .lava-asus-CM1400CXA-dalboz:amd64
- .lava-test-deqp:x86_64
- .radv-raven-test:x86_64
- .lava-asus-CM1400CXA-dalboz:x86_64
parallel: 9
variables:
DEQP_VER: vk
DEQP_FRACTION: 6
amd-raven-skqp:amd64:
amd-raven-skqp:x86_64:
extends:
- .lava-test-deqp:amd64
- .amd-raven-test:amd64
- .lava-lenovo-TPad-C13-Yoga-zork:amd64
- .lava-test-deqp:x86_64
- .amd-raven-test:x86_64
- .lava-lenovo-TPad-C13-Yoga-zork:x86_64
variables:
HWCI_START_WESTON: 1
DEQP_SUITE: amd-raven-skqp
.radv-traces:
extends:
- .lava-piglit-traces:amd64
- .lava-piglit-traces:x86_64
variables:
PIGLIT_PLATFORM: mixed_glx_egl # TODO, take wine/VK in account
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-amd.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
radv-raven-traces:amd64:
radv-raven-traces:x86_64:
extends:
- .radv-traces
- .radv-raven-test:amd64
- .lava-lenovo-TPad-C13-Yoga-zork:amd64
- .radv-raven-test:x86_64
- .lava-lenovo-TPad-C13-Yoga-zork:x86_64
variables:
HWCI_START_XORG: 1
PIGLIT_REPLAY_DEVICE_NAME: "vk-${GPU_VERSION}"
radeonsi-raven-piglit-quick_gl:amd64:
radeonsi-raven-piglit-quick_gl:x86_64:
extends:
- .lava-piglit:amd64
- .radeonsi-raven-test:amd64
- .lava-lenovo-TPad-C13-Yoga-zork:amd64
- .lava-piglit:x86_64
- .radeonsi-raven-test:x86_64
- .lava-lenovo-TPad-C13-Yoga-zork:x86_64
variables:
PIGLIT_PLATFORM: mixed_glx_egl
PIGLIT_PROFILES: quick_gl
HWCI_START_XORG: 1
radeonsi-raven-piglit-quick_shader:amd64:
radeonsi-raven-piglit-quick_shader:x86_64:
extends:
- radeonsi-raven-piglit-quick_gl:amd64
- radeonsi-raven-piglit-quick_gl:x86_64
variables:
PIGLIT_PROFILES: quick_shader
PIGLIT_FRACTION: 2
radeonsi-raven-va:amd64:
radeonsi-raven-va:x86_64:
extends:
- .lava-test-deqp:amd64
- .radeonsi-raven-test:amd64
- .lava-test-deqp:x86_64
- .radeonsi-raven-test:x86_64
- .radeonsi-vaapi-rules
- .lava-asus-CM1400CXA-dalboz:amd64
- .lava-asus-CM1400CXA-dalboz:x86_64
variables:
HWCI_TEST_SCRIPT: "/install/gtest-runner.sh"
# While the tests don't need Xorg, it's an easy way to keep DRM open so we don't
@ -180,9 +180,9 @@ radeonsi-raven-va:amd64:
# https://github.com/google/googletest/issues/3614 would probably help.
GTEST_FRACTION: 2
radeonsi-raven-va-full:amd64:
radeonsi-raven-va-full:x86_64:
extends:
- radeonsi-raven-va:amd64
- radeonsi-raven-va:x86_64
- .radeonsi-vaapi-manual-rules
variables:
GTEST_FRACTION: null

View File

@ -12,16 +12,16 @@
variables:
BM_BOOTFS: /boot/raspberrypi_arm64
.broadcom-test:armhf:
.broadcom-test:arm32:
extends:
- .broadcom-test
- .baremetal-test-armhf
- .baremetal-test-arm32
variables:
BM_BOOTFS: /boot/raspberrypi_armhf
vc4-rpi3-gl:armhf:
vc4-rpi3-gl:arm32:
extends:
- .broadcom-test:armhf
- .broadcom-test:arm32
- .vc4-rules
tags:
- igalia-rpi3
@ -32,9 +32,9 @@ vc4-rpi3-gl:armhf:
DEQP_SUITE: broadcom-rpi3
HWCI_START_WESTON: 1
v3d-rpi4-gl:armhf:
v3d-rpi4-gl:arm32:
extends:
- .broadcom-test:armhf
- .broadcom-test:arm32
- .v3d-rules
tags:
- igalia-rpi4

View File

@ -1,6 +1,6 @@
.etnaviv-armhf-test:
.etnaviv-test:arm32:
extends:
- .baremetal-test-armhf
- .baremetal-test-arm32
- .etnaviv-rules
script:
- ./install/bare-metal/fastboot.sh
@ -9,7 +9,7 @@
BM_KERNEL: /baremetal-files/zImage
FLAKES_CHANNEL: "#etnaviv-ci"
.etnaviv-arm64-test:
.etnaviv-test:arm64:
extends:
- .baremetal-test-arm64
- .etnaviv-rules
@ -20,9 +20,9 @@
BM_KERNEL: /baremetal-files/Image
FLAKES_CHANNEL: "#etnaviv-ci"
.etnaviv-armhf-gc2000:
.etnaviv-gc2000:arm32:
extends:
- .etnaviv-armhf-test
- .etnaviv-test:arm32
variables:
BM_DTB: /baremetal-files/imx6q-cubox-i.dtb
DEQP_EXPECTED_RENDERER: GC2000
@ -30,9 +30,9 @@
tags:
- etnaviv-gc2000
.etnaviv-arm64-gc7000:
.etnaviv-gc7000:arm64:
extends:
- .etnaviv-arm64-test
- .etnaviv-test:arm64
variables:
BM_DTB: /baremetal-files/imx8mq-nitrogen.dtb
DEQP_EXPECTED_RENDERER: GC7000
@ -42,7 +42,7 @@
gc2000_gles2:
extends:
- .etnaviv-armhf-gc2000
- .etnaviv-gc2000:arm32
- .etnaviv-manual-rules
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
@ -51,7 +51,7 @@ gc2000_gles2:
gc2000_piglit:
extends:
- .piglit-test
- .etnaviv-armhf-gc2000
- .etnaviv-gc2000:arm32
- .etnaviv-manual-rules
variables:
PIGLIT_PLATFORM: gbm
@ -60,7 +60,7 @@ gc2000_piglit:
gc7000_gles2:
extends:
- .etnaviv-arm64-gc7000
- .etnaviv-gc7000:arm64
- .etnaviv-manual-rules
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"

View File

@ -23,7 +23,7 @@
- .llvmpipe-clover-rules
needs:
- .debian-clover-testing
- debian/x86_test-gl
- debian/x86_64_test-gl
variables:
LP_CL: 1
DEQP_SUITE: llvmpipe-clover
@ -35,7 +35,7 @@ llvmpipe-piglit-rusticl:
- .llvmpipe-rusticl-rules
needs:
- debian-rusticl-testing
- debian/x86_test-gl
- debian/x86_64_test-gl
variables:
RUSTICL_ENABLE: "llvmpipe"
DEQP_SUITE: llvmpipe-rusticl
@ -85,5 +85,5 @@ llvmpipe-deqp-asan:
LP_NUM_THREADS: 0
extends: .llvmpipe-deqp-test
needs:
- debian/x86_test-gl
- debian/x86_64_test-gl
- debian-testing-asan

View File

@ -1,4 +1,4 @@
# General settings for bare-metal nouveau testing on either arm64 or armhf.
# General settings for bare-metal nouveau testing on either arm64 or arm32.
.nouveau-bm-test:
extends:
- .nouveau-rules
@ -12,7 +12,7 @@
.gk20a-test:
extends:
- .baremetal-test-armhf
- .baremetal-test-arm32
- .nouveau-bm-test
variables:
BM_BOOTFS: /baremetal-files/jetson-tk1/

View File

@ -33,5 +33,5 @@ softpipe-asan-gles31:
DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8"
extends: .softpipe-deqp-test
needs:
- debian/x86_test-gl
- debian/x86_64_test-gl
- debian-testing-asan

View File

@ -70,7 +70,7 @@ virgl-traces:
.virgl-iris-test:
extends:
- .lava-piglit-traces:amd64
- .lava-piglit-traces:x86_64
variables:
DEVICE_TYPE: asus-cx9400-volteer
BOOT_METHOD: depthcharge

View File

@ -78,7 +78,7 @@ zink-anv-tgl-full:
zink-anv-tgl-traces:
extends:
- .lava-piglit-traces:amd64
- .lava-piglit-traces:x86_64
- .zink-anv-test
- .zink-trace-test
# Add .lava-traces-base again to override .zink-anv-test setting the

View File

@ -30,7 +30,7 @@ lavapipe-vk-asan:
# Don't batch the tests into caselists while we're leaky.
DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:libdlclose-skip.so --tests-per-group 1"
needs:
- debian/x86_test-vk
- debian/x86_64_test-vk
- debian-testing-asan
lavapipe-traces:

View File

@ -1,6 +1,6 @@
.intel-common-test:
extends:
- .lava-test-deqp:amd64
- .lava-test-deqp:x86_64
variables:
DTB: ""
BOOT_METHOD: depthcharge
@ -298,7 +298,7 @@ iris-cml-traces:
HWCI_FREQ_MAX: "true"
LAVA_TAGS: "cbg-0"
# Ensure that we are using the release build artifact
MINIO_ARTIFACT_NAME: mesa-amd64-release
MINIO_ARTIFACT_NAME: mesa-x86_64-release
iris-apl-traces-performance:
extends:

View File

@ -42,16 +42,16 @@ panfrost-t720-gles2:arm64:
# We only have two machines, which we share with KernelCI.
# Keep the second t760 job manual.
panfrost-t760-gles2:armhf:
panfrost-t760-gles2:arm32:
extends:
- .lava-test-deqp:armhf
- .lava-test-deqp:arm32
- .panfrost-midgard-manual-rules
- .panfrost-test
- .lava-rk3288-veyron-jaq
.panfrost-t760-traces:armhf:
.panfrost-t760-traces:arm32:
extends:
- .lava-piglit-traces:armhf
- .lava-piglit-traces:arm32
- .panfrost-midgard-rules
- .panfrost-test
- .lava-rk3288-veyron-jaq