diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 24a10ed7bb1..f3f3fae8e6d 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-x86_64-default-${BUILDTYPE} + S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE} LLVM_VERSION: 15 script: - .gitlab-ci/meson/build.sh @@ -106,7 +106,7 @@ debian-testing-asan: -D b_sanitize=address -D valgrind=disabled -D tools=dlclose-skip - MINIO_ARTIFACT_NAME: "" + S3_ARTIFACT_NAME: "" ARTIFACTS_DEBUG_SYMBOLS: 1 debian-testing-msan: @@ -119,7 +119,7 @@ debian-testing-msan: EXTRA_OPTION: -D b_sanitize=memory -D b_lundef=false - MINIO_ARTIFACT_NAME: "" + S3_ARTIFACT_NAME: "" ARTIFACTS_DEBUG_SYMBOLS: 1 # Don't run all the tests yet: # GLSL has some issues in sexpression reading. @@ -237,7 +237,7 @@ debian-release: -D intel-clc=enabled -D imagination-srv=true BUILDTYPE: "release" - MINIO_ARTIFACT_NAME: "mesa-x86_64-default-${BUILDTYPE}" + S3_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-${BUILDTYPE} + S3_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-default-${BUILDTYPE} + S3_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-${BUILDTYPE} + S3_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-default-${BUILDTYPE} + S3_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-${BUILDTYPE} + S3_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-default-${BUILDTYPE} + S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE} C_ARGS: > -Wno-error=array-bounds -Wno-error=stringop-truncation diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index 416b59fe2cb..80b4d860582 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.gitlab-ci/cuttlefish-runner.sh @@ -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/. # 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 +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 ${S3_ARTIFACT_NAME}.tar.zst ${MESA_ANDROID_ARTIFACT_URL} +tar -xvf ${S3_ARTIFACT_NAME}.tar.zst $ADB push install/all-skips.txt /data/. $ADB push install/$GPU_VERSION-flakes.txt /data/. diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh index bf1ba7fe54c..328c1f610b1 100755 --- a/.gitlab-ci/lava/lava-submit.sh +++ b/.gitlab-ci/lava/lava-submit.sh @@ -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}" 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 # baremetal jobs. -if [ -n "${MINIO_ARTIFACT_NAME}" ] +if [ -n "${S3_ARTIFACT_NAME}" ] 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 touch results/lava.log diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh index 8e3e823c06b..3c487a40a05 100755 --- a/.gitlab-ci/prepare-artifacts.sh +++ b/.gitlab-ci/prepare-artifacts.sh @@ -55,11 +55,11 @@ cp -Rp .gitlab-ci/common artifacts/ci-common cp -Rp .gitlab-ci/lava 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 - MINIO_ARTIFACT_NAME="$MINIO_ARTIFACT_NAME.tar.zst" - zstd artifacts/install.tar -o ${MINIO_ARTIFACT_NAME} - ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ${MINIO_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME} + S3_ARTIFACT_NAME="$S3_ARTIFACT_NAME.tar.zst" + zstd artifacts/install.tar -o ${S3_ARTIFACT_NAME} + ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME} fi section_end prepare-artifacts diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 7ceb3b242ec..f9ab5722b25 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -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}-default-release + S3_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-default-release + S3_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-default-release" + S3_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-default-release" + S3_ARTIFACT_NAME: "mesa-x86_64-default-release" needs: - kernel+rootfs_x86_64 - debian-release diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index a78474b7050..b857e09ed2a 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -76,7 +76,7 @@ clang-format: - .test - .use-debian/x86_64_test-android variables: - MINIO_ARTIFACT_NAME: mesa-x86_64-android-debug + S3_ARTIFACT_NAME: mesa-x86_64-android-debug needs: - job: debian-testing artifacts: true # On the host we want the Linux build @@ -171,7 +171,7 @@ clang-format: - section_start artifacts_download "Downloading artifacts from s3" # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY - 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 artifacts: when: always @@ -191,7 +191,7 @@ clang-format: - .use-debian/arm32_test variables: BM_ROOTFS: /rootfs-armhf - MINIO_ARTIFACT_NAME: mesa-arm32-default-debugoptimized + S3_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-default-debugoptimized + S3_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-debugoptimized + S3_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-debugoptimized + S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized needs: - debian/arm64_test - job: debian-arm64-asan diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml index fbc748b5596..fb99c803fb7 100644 --- a/src/intel/ci/gitlab-ci.yml +++ b/src/intel/ci/gitlab-ci.yml @@ -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-default-release + S3_ARTIFACT_NAME: mesa-x86_64-default-release iris-apl-traces-performance: extends: