diff options
| author | David Heidelberg <david.heidelberg@collabora.com> | 2022-07-28 01:19:21 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-08-04 11:21:45 +0000 |
| commit | 95a7b65c1422b857eefa21358ca0229ab1a44587 (patch) | |
| tree | 50ed2d1f6c2aaa8eb773c3f5f59c882c351280a5 /.gitlab-ci/lava | |
| parent | 784642f773c3ad36c9a1c30721b55cb2c6752cde (diff) | |
| download | mesa-95a7b65c1422b857eefa21358ca0229ab1a44587.tar.gz | |
ci: replace gzip usage with zstd where posible
v2: added missing zstd to arm_build.sh
Reviewed-by: Emma Anholt <emma@anholt.net>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17776>
Diffstat (limited to '.gitlab-ci/lava')
| -rwxr-xr-x | .gitlab-ci/lava/lava-gitlab-ci.yml | 6 | ||||
| -rwxr-xr-x | .gitlab-ci/lava/lava_job_submitter.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index ef73ab18e9c..dce6e32d439 100755 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -12,9 +12,9 @@ BASE_SYSTEM_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${DISTRIBUTION_TAG}/${ARCH}" BASE_SYSTEM_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}" # per-job build artifacts - BUILD_PATH: "${PIPELINE_ARTIFACTS_BASE}/${CI_PROJECT_NAME}-${ARCH}.tar.gz" + BUILD_PATH: "${PIPELINE_ARTIFACTS_BASE}/${CI_PROJECT_NAME}-${ARCH}.tar.zst" JOB_ROOTFS_OVERLAY_PATH: "${JOB_ARTIFACTS_BASE}/job-rootfs-overlay.tar.gz" - JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.gz" + JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.zst" MINIO_RESULTS_UPLOAD: "${JOB_ARTIFACTS_BASE}" PIGLIT_NO_WINDOW: 1 VISIBILITY_GROUP: "Collabora+fdo" @@ -30,7 +30,7 @@ tags: - $RUNNER_TAG after_script: - - wget -q "https://${JOB_RESULTS_PATH}" -O- | tar -xz + - wget -q "https://${JOB_RESULTS_PATH}" -O- | tar --zstd -x .lava-test:armhf: variables: diff --git a/.gitlab-ci/lava/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py index 820aa048e28..9c4af85cfde 100755 --- a/.gitlab-ci/lava/lava_job_submitter.py +++ b/.gitlab-ci/lava/lava_job_submitter.py @@ -166,7 +166,7 @@ def generate_lava_yaml(args): run_steps += [ 'mkdir -p {}'.format(args.ci_project_dir), - 'wget -S --progress=dot:giga -O- {} | tar -xz -C {}'.format(args.build_url, args.ci_project_dir), + 'wget -S --progress=dot:giga -O- {} | tar --zstd -x -C {}'.format(args.build_url, args.ci_project_dir), 'wget -S --progress=dot:giga -O- {} | tar -xz -C /'.format(args.job_rootfs_overlay_url), # Sleep a bit to give time for bash to dump shell xtrace messages into |