Module: Mesa Branch: main Commit: fed5a50d0f5b927a632ae2457128f08641ad7599 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fed5a50d0f5b927a632ae2457128f08641ad7599
Author: David Heidelberg <[email protected]> Date: Fri Jun 2 23:01:14 2023 +0200 ci: missed variable inside the big rename and split ARCH and DEBIAN_ARCH Fixes: 5140ff194841 ("ci: rename x86 and amd64 to x86_64, armhf to arm32, and i386 to x86_32") Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23406> --- .gitlab-ci/build/gitlab-ci.yml | 4 ++-- .gitlab-ci/lava/lava-gitlab-ci.yml | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 6f79777e521..2380291bea7 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -87,7 +87,7 @@ debian-testing: -D valgrind=disabled -D perfetto=true -D tools=drm-shim - MINIO_ARTIFACT_NAME: mesa-amd64 + MINIO_ARTIFACT_NAME: mesa-x86_64 LLVM_VERSION: 15 script: - .gitlab-ci/meson/build.sh @@ -236,7 +236,7 @@ debian-release: -D intel-clc=enabled -D imagination-srv=true BUILDTYPE: "release" - MINIO_ARTIFACT_NAME: "mesa-amd64-${BUILDTYPE}" + MINIO_ARTIFACT_NAME: "mesa-x86_64-${BUILDTYPE}" script: - .gitlab-ci/meson/build.sh - 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi' diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index b1a81873fab..97b363cf663 100755 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -8,8 +8,8 @@ FDO_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri="; # base system generated by the container build job, shared between many pipelines BASE_SYSTEM_HOST_PREFIX: "${MINIO_HOST}/mesa-lava" - BASE_SYSTEM_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${DISTRIBUTION_TAG}/${ARCH}" - BASE_SYSTEM_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}" + BASE_SYSTEM_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}" + BASE_SYSTEM_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}" # per-job build artifacts BUILD_PATH: "${PIPELINE_ARTIFACTS_BASE}/${CI_PROJECT_NAME}-${ARCH}.tar.zst" JOB_ROOTFS_OVERLAY_PATH: "${JOB_ARTIFACTS_BASE}/job-rootfs-overlay.tar.gz" @@ -35,7 +35,8 @@ .lava-test:arm32: variables: - ARCH: armhf + ARCH: arm32 + DEBIAN_ARCH: armhf KERNEL_IMAGE_NAME: zImage KERNEL_IMAGE_TYPE: "zimage" BOOT_METHOD: u-boot @@ -58,6 +59,7 @@ .lava-test:arm64: variables: ARCH: arm64 + DEBIAN_ARCH: arm64 KERNEL_IMAGE_NAME: Image KERNEL_IMAGE_TYPE: "image" BOOT_METHOD: u-boot @@ -81,7 +83,8 @@ .lava-test:x86_64: variables: - ARCH: amd64 + ARCH: x86_64 + DEBIAN_ARCH: amd64 KERNEL_IMAGE_NAME: bzImage KERNEL_IMAGE_TYPE: "zimage" BOOT_METHOD: u-boot
