ci: specify MinIO's host URL in a global variable
Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388>
This commit is contained in:
parent
9705434579
commit
6b9b9baeab
|
@ -5,6 +5,7 @@ variables:
|
||||||
set -o xtrace
|
set -o xtrace
|
||||||
/usr/bin/wget -q -O- ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh | sh -
|
/usr/bin/wget -q -O- ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh | sh -
|
||||||
set +o xtrace
|
set +o xtrace
|
||||||
|
MINIO_HOST: minio-packet.freedesktop.org
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- project: 'freedesktop/ci-templates'
|
- project: 'freedesktop/ci-templates'
|
||||||
|
@ -491,7 +492,7 @@ make git archive:
|
||||||
|
|
||||||
# login with the JWT token
|
# login with the JWT token
|
||||||
- ci-fairy minio login $CI_JOB_JWT
|
- ci-fairy minio login $CI_JOB_JWT
|
||||||
- ci-fairy minio cp ../$CI_PROJECT_NAME.tar.gz minio://minio-packet.freedesktop.org/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
|
- ci-fairy minio cp ../$CI_PROJECT_NAME.tar.gz minio://$MINIO_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
|
||||||
|
|
||||||
|
|
||||||
# Sanity checks of MR settings and commit logs
|
# Sanity checks of MR settings and commit logs
|
||||||
|
|
|
@ -5,7 +5,7 @@ set -o xtrace
|
||||||
|
|
||||||
check_minio()
|
check_minio()
|
||||||
{
|
{
|
||||||
MINIO_PATH="minio-packet.freedesktop.org/mesa-lava/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
|
MINIO_PATH="${MINIO_HOST}/mesa-lava/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
|
||||||
if wget -q --method=HEAD "https://${MINIO_PATH}/done"; then
|
if wget -q --method=HEAD "https://${MINIO_PATH}/done"; then
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -17,7 +17,7 @@ TMP_DIR=$(mktemp -d)
|
||||||
|
|
||||||
echo "Downloading archived master..."
|
echo "Downloading archived master..."
|
||||||
/usr/bin/wget -O $TMP_DIR/mesa.tar.gz \
|
/usr/bin/wget -O $TMP_DIR/mesa.tar.gz \
|
||||||
https://minio-packet.freedesktop.org/git-cache/${FDO_UPSTREAM_REPO}/mesa.tar.gz
|
https://${MINIO_HOST}/git-cache/${FDO_UPSTREAM_REPO}/mesa.tar.gz
|
||||||
|
|
||||||
# check wget error code
|
# check wget error code
|
||||||
if [[ $? -ne 0 ]]
|
if [[ $? -ne 0 ]]
|
||||||
|
|
|
@ -46,8 +46,8 @@ kernel+rootfs_armhf:
|
||||||
ENV_VARS: "DEQP_PARALLEL=6"
|
ENV_VARS: "DEQP_PARALLEL=6"
|
||||||
FIXED_ENV_VARS: "CI_PIPELINE_ID=${CI_PIPELINE_ID} CI_JOB_ID=${CI_JOB_ID} CI_PROJECT_PATH=${CI_PROJECT_PATH} CI_JOB_JWT=${CI_JOB_JWT} TRACIE_NO_UNIT_TESTS=1 TRACIE_UPLOAD_TO_MINIO=1 DRIVER_NAME=${DRIVER_NAME}"
|
FIXED_ENV_VARS: "CI_PIPELINE_ID=${CI_PIPELINE_ID} CI_JOB_ID=${CI_JOB_ID} CI_PROJECT_PATH=${CI_PROJECT_PATH} CI_JOB_JWT=${CI_JOB_JWT} TRACIE_NO_UNIT_TESTS=1 TRACIE_UPLOAD_TO_MINIO=1 DRIVER_NAME=${DRIVER_NAME}"
|
||||||
DEQP_VERSION: gles2
|
DEQP_VERSION: gles2
|
||||||
ARTIFACTS_PREFIX: "https://minio-packet.freedesktop.org/mesa-lava/"
|
ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava/"
|
||||||
MESA_URL: "https://minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/mesa-${ARCH}.tar.gz"
|
MESA_URL: "https://${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/mesa-${ARCH}.tar.gz"
|
||||||
script:
|
script:
|
||||||
# Try to use the kernel and rootfs built in mainline first, to save cycles
|
# Try to use the kernel and rootfs built in mainline first, to save cycles
|
||||||
- >
|
- >
|
||||||
|
|
|
@ -47,8 +47,9 @@ if [ -n "$UPLOAD_FOR_LAVA" ]; then
|
||||||
cp $CI_PROJECT_DIR/.gitlab-ci/lava-deqp.yml.jinja2 artifacts/.
|
cp $CI_PROJECT_DIR/.gitlab-ci/lava-deqp.yml.jinja2 artifacts/.
|
||||||
cp $CI_PROJECT_DIR/.gitlab-ci/lava-tracie.yml.jinja2 artifacts/.
|
cp $CI_PROJECT_DIR/.gitlab-ci/lava-tracie.yml.jinja2 artifacts/.
|
||||||
|
|
||||||
gzip -c artifacts/install.tar > mesa-${DEBIAN_ARCH}.tar.gz
|
MESA_ARTIFACT=mesa-${DEBIAN_ARCH}.tar.gz
|
||||||
MINIO_PATH=minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
|
gzip -c artifacts/install.tar > ${MESA_ARTIFACT}
|
||||||
|
MINIO_PATH=${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
|
||||||
ci-fairy minio login $CI_JOB_JWT
|
ci-fairy minio login $CI_JOB_JWT
|
||||||
ci-fairy minio cp mesa-${DEBIAN_ARCH}.tar.gz minio://${MINIO_PATH}/mesa-${DEBIAN_ARCH}.tar.gz
|
ci-fairy minio cp ${MESA_ARTIFACT} minio://${MINIO_PATH}/${MESA_ARTIFACT}
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue