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

ci: rename MINIO to S3

Browse Source 
We don't use MINIO for a long time. Rename variable accordingly.

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:34:04 +02:00
parent e1737c46b9
commit 7b6629a694
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -52,9 +52,9 @@ $ADB push /deqp/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master
$ADB push /deqp-runner/deqp-runner /data/. $ADB push /deqp-runner/deqp-runner /data/.
# download Android Mesa from S3 # download Android Mesa from S3
MESA_ANDROID_ARTIFACT_URL=https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.zst MESA_ANDROID_ARTIFACT_URL=https://${PIPELINE_ARTIFACTS_BASE}/${S3_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} curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -o ${S3_ARTIFACT_NAME}.tar.zst ${MESA_ANDROID_ARTIFACT_URL}
tar -xvf ${MINIO_ARTIFACT_NAME}.tar.zst tar -xvf ${S3_ARTIFACT_NAME}.tar.zst
$ADB push install/all-skips.txt /data/. $ADB push install/all-skips.txt /data/.
$ADB push install/$GPU_VERSION-flakes.txt /data/. $ADB push install/$GPU_VERSION-flakes.txt /data/.

6
.gitlab-ci/lava/lava-submit.sh
View File

@@ -33,12 +33,12 @@ tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ .
ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" job-rootfs-overlay.tar.gz "https://${JOB_ROOTFS_OVERLAY_PATH}" ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" job-rootfs-overlay.tar.gz "https://${JOB_ROOTFS_OVERLAY_PATH}"
ARTIFACT_URL="${FDO_HTTP_CACHE_URI:-}https://${BUILD_PATH}" ARTIFACT_URL="${FDO_HTTP_CACHE_URI:-}https://${BUILD_PATH}"
# Make it take the mesa build from MINIO_ARTIFACT_NAME, if it is specified in # Make it take the mesa build from S3_ARTIFACT_NAME, if it is specified in
# the environment. This will make the LAVA behavior consistent with the # the environment. This will make the LAVA behavior consistent with the
# baremetal jobs. # baremetal jobs.
if [ -n "${MINIO_ARTIFACT_NAME}" ] if [ -n "${S3_ARTIFACT_NAME}" ]
then then
ARTIFACT_URL="${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.zst" ARTIFACT_URL="${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}.tar.zst"
fi fi
touch results/lava.log touch results/lava.log

8
.gitlab-ci/prepare-artifacts.sh
View File

@@ -55,11 +55,11 @@ cp -Rp .gitlab-ci/common artifacts/ci-common
cp -Rp .gitlab-ci/lava artifacts/ cp -Rp .gitlab-ci/lava artifacts/
cp -Rp .gitlab-ci/b2c artifacts/ cp -Rp .gitlab-ci/b2c artifacts/
if [ -n "$MINIO_ARTIFACT_NAME" ]; then if [ -n "$S3_ARTIFACT_NAME" ]; then
# Pass needed files to the test stage # Pass needed files to the test stage
MINIO_ARTIFACT_NAME="$MINIO_ARTIFACT_NAME.tar.zst" S3_ARTIFACT_NAME="$S3_ARTIFACT_NAME.tar.zst"
zstd artifacts/install.tar -o ${MINIO_ARTIFACT_NAME} zstd artifacts/install.tar -o ${S3_ARTIFACT_NAME}
ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ${MINIO_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME} ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}
fi fi
section_end prepare-artifacts section_end prepare-artifacts

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

@@ -100,7 +100,7 @@
# Always use the same device # Always use the same device
LAVA_TAGS: "cbg-0" LAVA_TAGS: "cbg-0"
# Ensure that we are using the release build artifact # Ensure that we are using the release build artifact
MINIO_ARTIFACT_NAME: mesa-${ARCH}-default-release S3_ARTIFACT_NAME: mesa-${ARCH}-default-release
# Reset dependencies in performance jobs to enforce the release build artifact # Reset dependencies in performance jobs to enforce the release build artifact
dependencies: null dependencies: null
# Don't run in parallel. It is okay to performance jobs to take a little # Don't run in parallel. It is okay to performance jobs to take a little
@@ -367,7 +367,7 @@
variables: variables:
LAVA_JOB_PRIORITY: 40 LAVA_JOB_PRIORITY: 40
# Ensure that we are using the release build artifact # Ensure that we are using the release build artifact
MINIO_ARTIFACT_NAME: mesa-arm64-default-release S3_ARTIFACT_NAME: mesa-arm64-default-release
needs: needs:
- debian/arm64_test - debian/arm64_test
- debian-arm64-release - debian-arm64-release
@@ -712,7 +712,7 @@
allow_failure: true # see comment in .performance-rules, which we don't inherit this line from. allow_failure: true # see comment in .performance-rules, which we don't inherit this line from.
variables: variables:
LAVA_JOB_PRIORITY: 40 LAVA_JOB_PRIORITY: 40
MINIO_ARTIFACT_NAME: "mesa-x86_64-default-release" S3_ARTIFACT_NAME: "mesa-x86_64-default-release"
needs: needs:
- kernel+rootfs_x86_64 - kernel+rootfs_x86_64
- debian-release - debian-release
@@ -804,7 +804,7 @@
allow_failure: true # see comment in .performance-rules, which we don't inherit this line from. allow_failure: true # see comment in .performance-rules, which we don't inherit this line from.
variables: variables:
LAVA_JOB_PRIORITY: 40 LAVA_JOB_PRIORITY: 40
MINIO_ARTIFACT_NAME: "mesa-x86_64-default-release" S3_ARTIFACT_NAME: "mesa-x86_64-default-release"
needs: needs:
- kernel+rootfs_x86_64 - kernel+rootfs_x86_64
- debian-release - debian-release

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

@@ -76,7 +76,7 @@ clang-format:
- .test - .test
- .use-debian/x86_64_test-android - .use-debian/x86_64_test-android
variables: variables:
MINIO_ARTIFACT_NAME: mesa-x86_64-android-debug S3_ARTIFACT_NAME: mesa-x86_64-android-debug
needs: needs:
- job: debian-testing - job: debian-testing
artifacts: true # On the host we want the Linux build artifacts: true # On the host we want the Linux build
@@ -171,7 +171,7 @@ clang-format:
- section_start artifacts_download "Downloading artifacts from s3" - section_start artifacts_download "Downloading artifacts from s3"
# Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
- rm -rf install - rm -rf install
- (set -x; curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.zst | tar --zstd -x) - (set -x; curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}.tar.zst | tar --zstd -x)
- section_end artifacts_download - section_end artifacts_download
artifacts: artifacts:
when: always when: always
@@ -191,7 +191,7 @@ clang-format:
- .use-debian/arm32_test - .use-debian/arm32_test
variables: variables:
BM_ROOTFS: /rootfs-armhf BM_ROOTFS: /rootfs-armhf
MINIO_ARTIFACT_NAME: mesa-arm32-default-debugoptimized S3_ARTIFACT_NAME: mesa-arm32-default-debugoptimized
needs: needs:
- debian/arm32_test - debian/arm32_test
- job: debian-arm32 - job: debian-arm32
@@ -204,7 +204,7 @@ clang-format:
- .use-debian/arm64_test - .use-debian/arm64_test
variables: variables:
BM_ROOTFS: /rootfs-arm64 BM_ROOTFS: /rootfs-arm64
MINIO_ARTIFACT_NAME: mesa-arm64-default-debugoptimized S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized
needs: needs:
- debian/arm64_test - debian/arm64_test
- job: debian-arm64 - job: debian-arm64
@@ -217,7 +217,7 @@ clang-format:
- .use-debian/arm32_test - .use-debian/arm32_test
variables: variables:
DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so" DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
MINIO_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized S3_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized
needs: needs:
- debian/arm32_test - debian/arm32_test
- job: debian-arm32-asan - job: debian-arm32-asan
@@ -229,7 +229,7 @@ clang-format:
- .use-debian/arm64_test - .use-debian/arm64_test
variables: variables:
DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so" DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
MINIO_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
needs: needs:
- debian/arm64_test - debian/arm64_test
- job: debian-arm64-asan - job: debian-arm64-asan

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

@@ -298,7 +298,7 @@ iris-cml-traces:
HWCI_FREQ_MAX: "true" HWCI_FREQ_MAX: "true"
LAVA_TAGS: "cbg-0" LAVA_TAGS: "cbg-0"
# Ensure that we are using the release build artifact # Ensure that we are using the release build artifact
MINIO_ARTIFACT_NAME: mesa-x86_64-default-release S3_ARTIFACT_NAME: mesa-x86_64-default-release
iris-apl-traces-performance: iris-apl-traces-performance:
extends: extends: