OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: rename S3 artifacts according to scheme mesa-$arch-$config-$buildtype

Browse Source 
Make the S3 (previously MINIO) artifacts clearly identifiable by glance.

Also now we fail before compilation, if the job doesn't define
the BUILDTYPE variable to prevent confusion.

Reviewed-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23527>
This commit is contained in:
David Heidelberg
2023-06-08 17:22:13 +02:00
parent d4670eea0f
commit e1737c46b9
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.gitlab-ci/build/gitlab-ci.yml
View File

@@ -87,7 +87,7 @@ debian-testing:
-D valgrind=disabled
-D perfetto=true
-D tools=drm-shim
MINIO_ARTIFACT_NAME: mesa-x86_64
MINIO_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE}
LLVM_VERSION: 15
script:
- .gitlab-ci/meson/build.sh
@@ -237,7 +237,7 @@ debian-release:
-D intel-clc=enabled
-D imagination-srv=true
BUILDTYPE: "release"
MINIO_ARTIFACT_NAME: "mesa-x86_64-${BUILDTYPE}"
MINIO_ARTIFACT_NAME: "mesa-x86_64-default-${BUILDTYPE}"
script:
- .gitlab-ci/meson/build.sh
- 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi'
@@ -374,7 +374,7 @@ debian-android:
LLVM_VERSION: ""
PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
ARTIFACTS_DEBUG_SYMBOLS: 1
MINIO_ARTIFACT_NAME: mesa-x86_64-android
MINIO_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE}
script:
- CROSS=aarch64-linux-android GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d VULKAN_DRIVERS=freedreno,broadcom,virtio .gitlab-ci/meson/build.sh
# x86_64 build:
@@ -427,7 +427,7 @@ debian-arm32:
EXTRA_OPTION: >
-D llvm=disabled
-D valgrind=disabled
MINIO_ARTIFACT_NAME: mesa-arm32
MINIO_ARTIFACT_NAME: mesa-arm32-default-${BUILDTYPE}
# The strip command segfaults, failing to strip the binary and leaving
# tempfiles in our artifacts.
ARTIFACTS_DEBUG_SYMBOLS: 1
@@ -445,7 +445,7 @@ debian-arm32-asan:
-D valgrind=disabled
-D tools=dlclose-skip
ARTIFACTS_DEBUG_SYMBOLS: 1
MINIO_ARTIFACT_NAME: mesa-arm32-asan
MINIO_ARTIFACT_NAME: mesa-arm32-asan-${BUILDTYPE}
MESON_TEST_ARGS: "--no-suite mesa:compiler --no-suite mesa:util"
debian-arm64:
@@ -462,7 +462,7 @@ debian-arm64:
-D valgrind=disabled
-D imagination-srv=true
-D perfetto=true
MINIO_ARTIFACT_NAME: mesa-arm64
MINIO_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
script:
- .gitlab-ci/meson/build.sh
- .gitlab-ci/prepare-artifacts.sh
@@ -477,7 +477,7 @@ debian-arm64-asan:
-D valgrind=disabled
-D tools=dlclose-skip
ARTIFACTS_DEBUG_SYMBOLS: 1
MINIO_ARTIFACT_NAME: mesa-arm64-asan
MINIO_ARTIFACT_NAME: mesa-arm64-asan-${BUILDTYPE}
MESON_TEST_ARGS: "--no-suite mesa:compiler"
debian-arm64-build-test:
@@ -496,7 +496,7 @@ debian-arm64-release:
- debian-arm64
variables:
BUILDTYPE: release
MINIO_ARTIFACT_NAME: mesa-arm64-${BUILDTYPE}
MINIO_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
C_ARGS: >
-Wno-error=array-bounds
-Wno-error=stringop-truncation

3
.gitlab-ci/cuttlefish-runner.sh
View File

@@ -51,8 +51,7 @@ $ADB push /deqp/modules/egl/deqp-egl-android /data/.
$ADB push /deqp/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt /data/.
$ADB push /deqp-runner/deqp-runner /data/.
# download mesa-x86_64-android.tar.zst
# download Android Mesa from S3
MESA_ANDROID_ARTIFACT_URL=https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.zst
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -o ${MINIO_ARTIFACT_NAME}.tar.zst ${MESA_ANDROID_ARTIFACT_URL}
tar -xvf ${MINIO_ARTIFACT_NAME}.tar.zst

8
.gitlab-ci/test-source-dep.yml
View File

@@ -100,7 +100,7 @@
# Always use the same device
LAVA_TAGS: "cbg-0"
# Ensure that we are using the release build artifact
MINIO_ARTIFACT_NAME: mesa-${ARCH}-release
MINIO_ARTIFACT_NAME: mesa-${ARCH}-default-release
# Reset dependencies in performance jobs to enforce the release build artifact
dependencies: null
# Don't run in parallel. It is okay to performance jobs to take a little
@@ -367,7 +367,7 @@
variables:
LAVA_JOB_PRIORITY: 40
# Ensure that we are using the release build artifact
MINIO_ARTIFACT_NAME: mesa-arm64-release
MINIO_ARTIFACT_NAME: mesa-arm64-default-release
needs:
- debian/arm64_test
- debian-arm64-release
@@ -712,7 +712,7 @@
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-x86_64-release"
MINIO_ARTIFACT_NAME: "mesa-x86_64-default-release"
needs:
- kernel+rootfs_x86_64
- debian-release
@@ -804,7 +804,7 @@
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-x86_64-release"
MINIO_ARTIFACT_NAME: "mesa-x86_64-default-release"
needs:
- kernel+rootfs_x86_64
- debian-release

10
.gitlab-ci/test/gitlab-ci.yml
View File

@@ -76,7 +76,7 @@ clang-format:
- .test
- .use-debian/x86_64_test-android
variables:
MINIO_ARTIFACT_NAME: mesa-x86_64-android
MINIO_ARTIFACT_NAME: mesa-x86_64-android-debug
needs:
- job: debian-testing
artifacts: true # On the host we want the Linux build
@@ -191,7 +191,7 @@ clang-format:
- .use-debian/arm32_test
variables:
BM_ROOTFS: /rootfs-armhf
MINIO_ARTIFACT_NAME: mesa-arm32
MINIO_ARTIFACT_NAME: mesa-arm32-default-debugoptimized
needs:
- debian/arm32_test
- job: debian-arm32
@@ -204,7 +204,7 @@ clang-format:
- .use-debian/arm64_test
variables:
BM_ROOTFS: /rootfs-arm64
MINIO_ARTIFACT_NAME: mesa-arm64
MINIO_ARTIFACT_NAME: mesa-arm64-default-debugoptimized
needs:
- debian/arm64_test
- job: debian-arm64
@@ -217,7 +217,7 @@ clang-format:
- .use-debian/arm32_test
variables:
DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
MINIO_ARTIFACT_NAME: mesa-arm32-asan
MINIO_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized
needs:
- debian/arm32_test
- job: debian-arm32-asan
@@ -229,7 +229,7 @@ clang-format:
- .use-debian/arm64_test
variables:
DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
MINIO_ARTIFACT_NAME: mesa-arm64-asan
MINIO_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
needs:
- debian/arm64_test
- job: debian-arm64-asan

2
src/intel/ci/gitlab-ci.yml
View File

@@ -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-x86_64-release
MINIO_ARTIFACT_NAME: mesa-x86_64-default-release
iris-apl-traces-performance:
extends: