From 72b3c2e4baa124d84a798873a36f497cf3a9243f Mon Sep 17 00:00:00 2001 From: Sergi Blanch Torne Date: Wed, 24 Apr 2024 16:01:29 +0200 Subject: [PATCH] ci: identify and label S3 buckets As for the S3 bucket where the kernel image is stored has been identified and labeled, the other buckets in use can also be identified and labeled. cc: mesa-stable Signed-off-by: Sergi Blanch Torne Co-developed-by: Guilherme Gallo --- .gitlab-ci.yml | 12 ++++++++++-- .gitlab-ci/download-git-cache.sh | 2 +- .gitlab-ci/test/gitlab-ci.yml | 2 +- src/amd/ci/gitlab-ci.yml | 2 +- src/freedreno/ci/gitlab-ci.yml | 2 +- src/gallium/drivers/zink/ci/gitlab-ci.yml | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73fbb20e7ff..22415218f3b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,12 +76,20 @@ variables: S3_HOST: s3.freedesktop.org # This bucket is used to fetch the kernel image S3_KERNEL_BUCKET: mesa-rootfs + # Bucket for git cache + S3_GITCACHE_BUCKET: git-cache + # Bucket for the pipeline artifacts pushed to S3 + S3_ARTIFACTS_BUCKET: artifacts + # Buckets for traces + S3_TRACIE_RESULTS_BUCKET: mesa-tracie-results + S3_TRACIE_PUBLIC_BUCKET: mesa-tracie-public + S3_TRACIE_PRIVATE_BUCKET: mesa-tracie-private # per-pipeline artifact storage on MinIO - PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID} + PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/${S3_ARTIFACTS_BUCKET}/${CI_PROJECT_PATH}/${CI_PIPELINE_ID} # per-job artifact storage on MinIO JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID} # reference images stored for traces - PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/mesa-tracie-results/$FDO_UPSTREAM_REPO" + PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/${S3_TRACIE_RESULTS_BUCKET}/$FDO_UPSTREAM_REPO" # For individual CI farm status see .ci-farms folder # Disable farm with `git mv .ci-farms{,-disabled}/$farm_name` # Re-enable farm with `git mv .ci-farms{-disabled,}/$farm_name` diff --git a/.gitlab-ci/download-git-cache.sh b/.gitlab-ci/download-git-cache.sh index e36f7e5b1d3..27fb7a930c8 100644 --- a/.gitlab-ci/download-git-cache.sh +++ b/.gitlab-ci/download-git-cache.sh @@ -18,7 +18,7 @@ TMP_DIR=$(mktemp -d) echo "$(date +"%F %T") Downloading archived master..." if ! /usr/bin/wget \ -O "$TMP_DIR/$CI_PROJECT_NAME.tar.gz" \ - "https://${S3_HOST}/git-cache/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz"; + "https://${S3_HOST}/${S3_GITCACHE_BUCKET}/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz"; then echo "Repository cache not available" exit diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index bb4dd92cc8b..8ab76d9911e 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -158,7 +158,7 @@ python-test: exclude: - results/*.shader_cache variables: - PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-public --jwt-file=${S3_JWT_FILE} + PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PUBLIC_BUCKET} --jwt-file=${S3_JWT_FILE} # until we overcome Infrastructure issues, give traces extra 5 min before timeout DEVICE_HANGING_TIMEOUT_SEC: 600 script: diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index dcf8cd93052..181d87b5102 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -89,7 +89,7 @@ radv-raven-traces-restricted:x86_64: PIGLIT_REPLAY_ANGLE_TAG: "2023-02-10-1" PIGLIT_TRACES_FILE: restricted-traces-amd.yml PIGLIT_REPLAY_DEVICE_NAME: "vk-${GPU_VERSION}" - PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --minio_bucket=mesa-tracie-private --jwt-file=${S3_JWT_FILE} + PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --minio_bucket=${S3_TRACIE_PRIVATE_BUCKET} --jwt-file=${S3_JWT_FILE} FDO_CI_CONCURRENT: 10 radeonsi-raven-piglit-quick_gl:x86_64: diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 99c9ad12ea6..3948ed147d0 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -268,7 +268,7 @@ a630-traces-restricted: - .google-freedreno-rules-restricted variables: PIGLIT_TRACES_FILE: restricted-traces-freedreno.yml - PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${S3_JWT_FILE}" + PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PRIVATE_BUCKET} --jwt-file=${S3_JWT_FILE}" allow_failure: true a630-traces-performance: diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index e775e71b758..9dd5989304a 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -78,7 +78,7 @@ zink-anv-tgl-traces-restricted: - .zink-anv-rules-restricted variables: PIGLIT_TRACES_FILE: traces-zink-restricted.yml - PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${S3_JWT_FILE} + PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PRIVATE_BUCKET} --jwt-file=${S3_JWT_FILE} allow_failure: true zink-tu-a618: