diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2021-10-14 12:01:16 +1300 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2022-06-10 06:56:38 +0000 |
| commit | 4f7c6ba50bf6cab91aae9d077ccfb3b43e34de9f (patch) | |
| tree | 3e6fdecca8dfcdcb2a35b0157f4a84aae40b79ea /.gitlab-ci-main.yml | |
| parent | e67845a73c96db885b9724d52857955b51b74632 (diff) | |
| download | samba-4f7c6ba50bf6cab91aae9d077ccfb3b43e34de9f.tar.gz | |
gitlab-ci: Allow --xz compression on our samba-testbase.tar
This may make this faster to upload to our private gitlab server
which is not as close to our runners.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14863
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to '.gitlab-ci-main.yml')
| -rw-r--r-- | .gitlab-ci-main.yml | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index ff8780128bd..17497eb82f0 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -31,6 +31,11 @@ variables: GIT_STRATEGY: fetch GIT_DEPTH: "3" # + # Use GZip by default, it is fast and is good enough. Other options include --xz + + SAMBA_TESTBASE_TAR_OPTIONS: -z + + # # we run autobuild.py inside a samba CI docker image located on gitlab's registry # overwrite this variable if you want use your own image registry. # @@ -42,7 +47,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 34eff4df0b3dbbfabcd74d5c50c357a6faa280d5 + SAMBA_CI_CONTAINER_TAG: 42c62d342018c7adbc6aae5a6025df322cc03c18 # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. @@ -193,7 +198,7 @@ others: - "*.stderr" - "*.info" - system-info.txt - - samba-testbase.tar.gz + - samba-testbase.tar script: # gitlab predefines CI_JOB_NAME for each job. The gitlab job usually matches the # autobuild name, which means we can define a default template that runs most autobuild jobs @@ -210,9 +215,9 @@ others: - pushd /tmp && getfacl -R samba-testbase > samba-testbase.acl.dump && popd - chmod -R +w /tmp/samba-testbase - mv /tmp/samba-testbase.acl.dump /tmp/samba-testbase/ - - tar cfz samba-testbase.tar.gz /tmp/samba-testbase - - ls -la samba-testbase.tar.gz - - sha1sum samba-testbase.tar.gz + - tar $SAMBA_TESTBASE_TAR_OPTIONS -cf samba-testbase.tar /tmp/samba-testbase + - ls -la samba-testbase.tar + - sha1sum samba-testbase.tar .shared_template_test_only: extends: @@ -226,9 +231,9 @@ others: - if [ -x "$(command -v krb5-config)" ]; then krb5-config --version; fi # We unpack the artifacts file created by the .shared_template_build_only # run we depend on - - ls -la samba-testbase.tar.gz - - sha1sum samba-testbase.tar.gz - - tar xfz samba-testbase.tar.gz -C / + - ls -la samba-testbase.tar + - sha1sum samba-testbase.tar + - tar $SAMBA_TESTBASE_TAR_OPTIONS -xf samba-testbase.tar -C / - diff -u /tmp/samba-testbase/image-sha1sum.txt /sha1sum.txt - diff -u /tmp/samba-testbase/commit.txt /tmp/commit.txt - mv /tmp/samba-testbase/samba-testbase.acl.dump /tmp/samba-testbase.acl.dump |