diff options
| author | David Heidelberg <david.heidelberg@collabora.com> | 2022-11-09 17:25:11 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-11-23 10:59:50 +0000 |
| commit | b15ac6f9cbcd64c47015d745c3124fd66fb9bc72 (patch) | |
| tree | d207ca781d7c8a88915c955872c5bc2611cc64e8 | |
| parent | 8b340e27502fcbc1f232342275f2558cec5ee204 (diff) | |
| download | virglrenderer-b15ac6f9cbcd64c47015d745c3124fd66fb9bc72.tar.gz | |
ci: migrate from minio to s3upstream-master
Rename `MINIO_HOST` to `STORAGE_HOST`.
Reviewed-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/977>
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rwxr-xr-x | .gitlab-ci/container/debian/x86_test.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/expectations/virt/traces-virgl.yml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f9f7351..3955e386 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,14 +13,14 @@ variables: # MESA_PIPELINE_ID: 743439 MESA_PROJECT_PATH: mesa/mesa - MINIO_HOST: minio-packet.freedesktop.org + STORAGE_HOST: s3.freedesktop.org CI_REGISTRY_IMAGE: "registry.freedesktop.org/${MESA_PROJECT_PATH}" # per-pipeline artifact storage on MinIO - PIPELINE_ARTIFACTS_BASE: ${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID} + PIPELINE_ARTIFACTS_BASE: ${STORAGE_HOST}/artifacts/${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: "${MINIO_HOST}/mesa-tracie-results/${FDO_UPSTREAM_REPO}" + PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${STORAGE_HOST}/mesa-tracie-results/${FDO_UPSTREAM_REPO}" include: diff --git a/.gitlab-ci/container/debian/x86_test.sh b/.gitlab-ci/container/debian/x86_test.sh index a60e15e6..f7d5fa21 100755 --- a/.gitlab-ci/container/debian/x86_test.sh +++ b/.gitlab-ci/container/debian/x86_test.sh @@ -7,7 +7,7 @@ mkdir -p ${MESA_CI_PROJECT_DIR} cd ${MESA_CI_PROJECT_DIR} # Deploy Mesa CI artifacts -MESA_CI_ARTIFACTS_URL="https://${MINIO_HOST}/artifacts/${MESA_PROJECT_PATH}/${MESA_PIPELINE_ID}/mesa-amd64.tar.gz" +MESA_CI_ARTIFACTS_URL="https://${STORAGE_HOST}/artifacts/${MESA_PROJECT_PATH}/${MESA_PIPELINE_ID}/mesa-amd64.tar.gz" if wget -q --method=HEAD ${MESA_CI_ARTIFACTS_URL}; then wget -S --progress=dot:giga -O- ${MESA_CI_ARTIFACTS_URL} | tar -xvz else diff --git a/.gitlab-ci/expectations/virt/traces-virgl.yml b/.gitlab-ci/expectations/virt/traces-virgl.yml index 26647eb3..bb4d8b30 100644 --- a/.gitlab-ci/expectations/virt/traces-virgl.yml +++ b/.gitlab-ci/expectations/virt/traces-virgl.yml @@ -1,5 +1,5 @@ traces-db: - download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/" + download-url: "https://s3.freedesktop.org/mesa-tracie-public/" traces: - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true-v2.trace |