diff options
| author | Guilherme Gallo <guilherme.gallo@collabora.com> | 2023-03-08 13:34:00 -0300 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-03-10 21:40:23 +0000 |
| commit | 256e7888fd0c3c7f6c836ad67d3a4f980e700a31 (patch) | |
| tree | 0b5ad85c31340d1c4bc58e27b77985ef3e8c8fa1 /.gitlab-ci/build | |
| parent | 91a129b44a4aff71cd7d49af569e5695d9a03706 (diff) | |
| download | mesa-256e7888fd0c3c7f6c836ad67d3a4f980e700a31.tar.gz | |
ci: Fix release build use for performance jobs
This commit ensures that we are using mesa release builds in performance
jobs.
To achieve that, some modifications were made on top of
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21492.
- Append the `BUILDTYPE` variable into the S3 artifact name
(MINIO_ARTIFACT_NAME environment variable) to allow for better
artifact management.
- The ./artifacts directory has been added to the list of artifact
directories for build-common. This ensures that the debian-release and
debian-arm64-release jobs are the only ones necessary for running
performance jobs. These jobs only produce artifacts via
prepare-artifacts.sh when we are under performance workflow.
- Make lava-submit.sh behave similar to baremetal jobs regarding
MINIO_ARTIFACT_NAME variable. For example, users can now easily
differentiate between mesa-arm64.tar.zstd and
mesa-arm64-release.tar.zstd by looking inside the `Downloading
artifacts from s3` Gitlab section.
Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21804>
Diffstat (limited to '.gitlab-ci/build')
| -rw-r--r-- | .gitlab-ci/build/gitlab-ci.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index ae07eb13b83..6ca1e3bfcc7 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -10,6 +10,7 @@ - _build/meson-logs/*.txt - _build/meson-logs/strace - shader-db + - artifacts # Just Linux .build-linux: @@ -221,14 +222,14 @@ debian-release: -D llvm=enabled GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,freedreno,r300,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus" VULKAN_DRIVERS: "amd,imagination-experimental,microsoft-experimental" - BUILDTYPE: "release" EXTRA_OPTION: > -D spirv-to-dxil=true -D osmesa=true -D tools=all -D intel-clc=enabled -D imagination-srv=true - MINIO_ARTIFACT_NAME: "mesa-amd64-rel" + BUILDTYPE: "release" + MINIO_ARTIFACT_NAME: "mesa-amd64-${BUILDTYPE}" script: - .gitlab-ci/meson/build.sh - 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi' @@ -468,8 +469,8 @@ debian-arm64-release: extends: - debian-arm64 variables: - MINIO_ARTIFACT_NAME: mesa-arm64-rel - BUILDTYPE: "release" + BUILDTYPE: release + MINIO_ARTIFACT_NAME: mesa-arm64-${BUILDTYPE} C_ARGS: > -Wno-error=stringop-truncation script: |