mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-04 13:30:11 +01:00
ci/fluster: Move Fluster to its own subfolder in the test-video container
We have a spacious new container, move fluster to its own subfolder. Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34787>
This commit is contained in:
parent
1bc853f2a0
commit
3ca7897ba9
2 changed files with 5 additions and 5 deletions
|
|
@ -8,11 +8,11 @@
|
|||
# .gitlab-ci/image-tags.yml tags:
|
||||
# DEBIAN_TEST_VIDEO_TAG
|
||||
|
||||
# Install fluster in /usr/local.
|
||||
# Install fluster in /fluster.
|
||||
|
||||
set -uex
|
||||
|
||||
section_start fluster "Install fluster"
|
||||
section_start fluster "Installing fluster"
|
||||
|
||||
FLUSTER_REVISION="e997402978f62428fffc8e5a4a709690d9ca9bc5"
|
||||
|
||||
|
|
@ -54,11 +54,11 @@ if ! $SKIP_UPDATE_FLUSTER_VECTORS; then
|
|||
"https://${S3_PATH_FLUSTER}/vectors.tar.zst"
|
||||
fi
|
||||
|
||||
mv fluster/ /usr/local/
|
||||
mv fluster/ /
|
||||
|
||||
if $SKIP_UPDATE_FLUSTER_VECTORS; then
|
||||
curl -L --retry 4 -f --retry-connrefused --retry-delay 30 \
|
||||
"${FDO_HTTP_CACHE_URI:-}https://${S3_PATH_FLUSTER}" | tar --zstd -x -C /usr/local/
|
||||
"${FDO_HTTP_CACHE_URI:-}https://${S3_PATH_FLUSTER}" | tar --zstd -x -C /
|
||||
fi
|
||||
|
||||
section_end fluster
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ set +e
|
|||
|
||||
fluster-runner \
|
||||
run \
|
||||
--fluster /usr/local/fluster/fluster.py \
|
||||
--fluster /fluster/fluster.py \
|
||||
--output ${RESULTS} \
|
||||
--jobs ${FDO_CI_CONCURRENT:-4} \
|
||||
--skips ${FLUSTER_SKIPS} \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue