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>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index ff8780128bda770613bd404a67cc05855bb72e54..17497eb82f04a729b8d41e09255faf1b0224db59 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -30,6 +30,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

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 59d93b1468634648560c4a622e0e541cee8fccd9..1ea8a51983edf277f533c1979baca7345b895c25 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -179,6 +179,7 @@ PKGS = [
     ('docbook-xsl', 'docbook-style-xsl'),
     ('', 'keyutils-libs-devel'),
     ('', 'which'),
+    ('xz-utils', 'xz')
 ]
 
 

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index ebd46784863fb7483cb337926bc7313f57a982e0..7cf9983d11f910de3fa75eaae853536b539d131e 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -107,6 +107,7 @@ yum install -y \
     wget \
     which \
     xfsprogs-devel \
+    xz \
     yum-utils \
     zlib-devel
 

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index f8a821f45dca0bdea4d2c3899ef5d7de66cc1464..57dcf2a68a242055afc362cc6cf51257340affbd 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -93,5 +93,6 @@ packages:
   - wget
   - which
   - xfsprogs-devel
+  - xz
   - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh
index 5b95521f4389342a6073f9b27541927a2d9d86c1..7852a8a54b26fdc5cda2914891a35a10f85a303d 100755 (executable)
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -117,6 +117,7 @@ yum install -y \
     wget \
     which \
     xfsprogs-devel \
+    xz \
     yum-utils \
     zlib-devel
 

diff --git a/bootstrap/generated-dists/centos8s/packages.yml b/bootstrap/generated-dists/centos8s/packages.yml
index 79f74bbac51f0feb933f897feec59cd287c053f6..1429d53aa4d343c182b51aef1c653a187466bd57 100644 (file)
--- a/bootstrap/generated-dists/centos8s/packages.yml
+++ b/bootstrap/generated-dists/centos8s/packages.yml
@@ -98,5 +98,6 @@ packages:
   - wget
   - which
   - xfsprogs-devel
+  - xz
   - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index f59d224026f6c9741dc442cabdd7be789c78b3cf..a0803575d1ed5ba39d0abf3d9e2acdec2eccfe9f 100755 (executable)
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -105,6 +105,7 @@ apt-get -y install \
     wget \
     xfslibs-dev \
     xsltproc \
+    xz-utils \
     zlib1g-dev
 
 apt-get -y autoremove

diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index d1c92af888498d6815dea2a7d907b8f404d4e1d9..eb0cf032c4f624ce7552e94b75cf1b237d32896c 100644 (file)
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -94,4 +94,5 @@ packages:
   - wget
   - xfslibs-dev
   - xsltproc
+  - xz-utils
   - zlib1g-dev
\ No newline at end of file

diff --git a/bootstrap/generated-dists/f36mit120/bootstrap.sh b/bootstrap/generated-dists/f36mit120/bootstrap.sh
index 3b937f4abb1b7ee822da66c54d56471dfeef31a1..08fb93c772eb7118e4dd055cd027d9b838bd7ce8 100755 (executable)
--- a/bootstrap/generated-dists/f36mit120/bootstrap.sh
+++ b/bootstrap/generated-dists/f36mit120/bootstrap.sh
@@ -116,6 +116,7 @@ dnf install -y \
     wget \
     which \
     xfsprogs-devel \
+    xz \
     yum-utils \
     zlib-devel
 

diff --git a/bootstrap/generated-dists/f36mit120/packages.yml b/bootstrap/generated-dists/f36mit120/packages.yml
index 0fb207dc137831eb2d198bae6d7623ab6bddfb6e..d5277842d9fcdfa9eccf943ed38baf59e5bc3600 100644 (file)
--- a/bootstrap/generated-dists/f36mit120/packages.yml
+++ b/bootstrap/generated-dists/f36mit120/packages.yml
@@ -102,5 +102,6 @@ packages:
   - wget
   - which
   - xfsprogs-devel
+  - xz
   - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/generated-dists/fedora36/bootstrap.sh b/bootstrap/generated-dists/fedora36/bootstrap.sh
index ad38475228f21fab112f70ba5f9c0fdd053c206f..5c19ba5bbb7ac9e62daf0a3122e156a91b893d7b 100755 (executable)
--- a/bootstrap/generated-dists/fedora36/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora36/bootstrap.sh
@@ -113,6 +113,7 @@ dnf install -y \
     wget \
     which \
     xfsprogs-devel \
+    xz \
     yum-utils \
     zlib-devel
 

diff --git a/bootstrap/generated-dists/fedora36/packages.yml b/bootstrap/generated-dists/fedora36/packages.yml
index 0fb207dc137831eb2d198bae6d7623ab6bddfb6e..d5277842d9fcdfa9eccf943ed38baf59e5bc3600 100644 (file)
--- a/bootstrap/generated-dists/fedora36/packages.yml
+++ b/bootstrap/generated-dists/fedora36/packages.yml
@@ -102,5 +102,6 @@ packages:
   - wget
   - which
   - xfsprogs-devel
+  - xz
   - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/generated-dists/opensuse153/bootstrap.sh b/bootstrap/generated-dists/opensuse153/bootstrap.sh
index 8f1715f9edbafefab0fb0a38f66117fddf2cc427..3b5bb54dd3f4fc2adccd27b43bdc944593a5f740 100755 (executable)
--- a/bootstrap/generated-dists/opensuse153/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse153/bootstrap.sh
@@ -106,6 +106,7 @@ zypper --non-interactive install \
     wget \
     which \
     xfsprogs-devel \
+    xz \
     yum-utils \
     zlib-devel
 

diff --git a/bootstrap/generated-dists/opensuse153/packages.yml b/bootstrap/generated-dists/opensuse153/packages.yml
index 29fa159b5d4e2afe61334972f9e8a2a48e9bd5af..bf89abc676523aab9dd536f9e928deb39ea3c23a 100644 (file)
--- a/bootstrap/generated-dists/opensuse153/packages.yml
+++ b/bootstrap/generated-dists/opensuse153/packages.yml
@@ -94,5 +94,6 @@ packages:
   - wget
   - which
   - xfsprogs-devel
+  - xz
   - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 6a28e2d655d205628f7909388ed84934672843e2..c1e80c9c527d76734a89776b04af1520d5ef2d5c 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -105,6 +105,7 @@ apt-get -y install \
     wget \
     xfslibs-dev \
     xsltproc \
+    xz-utils \
     zlib1g-dev
 
 apt-get -y autoremove

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index e03b05a6e4a1470e17d6bd6e1e21fb0a293f5dd1..3c43aa7f277a3204b012e6f333039ef7cda63413 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -94,4 +94,5 @@ packages:
   - wget
   - xfslibs-dev
   - xsltproc
+  - xz-utils
   - zlib1g-dev
\ No newline at end of file

diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 6a28e2d655d205628f7909388ed84934672843e2..c1e80c9c527d76734a89776b04af1520d5ef2d5c 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -105,6 +105,7 @@ apt-get -y install \
     wget \
     xfslibs-dev \
     xsltproc \
+    xz-utils \
     zlib1g-dev
 
 apt-get -y autoremove

diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index e03b05a6e4a1470e17d6bd6e1e21fb0a293f5dd1..3c43aa7f277a3204b012e6f333039ef7cda63413 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -94,4 +94,5 @@ packages:
   - wget
   - xfslibs-dev
   - xsltproc
+  - xz-utils
   - zlib1g-dev
\ No newline at end of file

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 0a3797326be551fc78966d2e2308bb96f2d0ed84..dbc778673185b5f682fe009e57de6950d0c327fe 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-34eff4df0b3dbbfabcd74d5c50c357a6faa280d5
+42c62d342018c7adbc6aae5a6025df322cc03c18