summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2021-10-14 12:01:16 +1300
committerAndreas Schneider <asn@cryptomilk.org>2022-06-10 06:56:38 +0000
commit4f7c6ba50bf6cab91aae9d077ccfb3b43e34de9f (patch)
tree3e6fdecca8dfcdcb2a35b0157f4a84aae40b79ea /bootstrap
parente67845a73c96db885b9724d52857955b51b74632 (diff)
downloadsamba-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 'bootstrap')
-rw-r--r--bootstrap/config.py1
-rwxr-xr-xbootstrap/generated-dists/centos7/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/centos7/packages.yml1
-rwxr-xr-xbootstrap/generated-dists/centos8s/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/centos8s/packages.yml1
-rwxr-xr-xbootstrap/generated-dists/debian11/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/debian11/packages.yml1
-rwxr-xr-xbootstrap/generated-dists/f36mit120/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/f36mit120/packages.yml1
-rwxr-xr-xbootstrap/generated-dists/fedora36/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/fedora36/packages.yml1
-rwxr-xr-xbootstrap/generated-dists/opensuse153/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/opensuse153/packages.yml1
-rwxr-xr-xbootstrap/generated-dists/ubuntu1804/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/ubuntu1804/packages.yml1
-rwxr-xr-xbootstrap/generated-dists/ubuntu2004/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/ubuntu2004/packages.yml1
-rw-r--r--bootstrap/sha1sum.txt2
18 files changed, 18 insertions, 1 deletions
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 59d93b14686..1ea8a51983e 100644
--- 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 ebd46784863..7cf9983d11f 100755
--- 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 f8a821f45dc..57dcf2a68a2 100644
--- 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 5b95521f438..7852a8a54b2 100755
--- 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 79f74bbac51..1429d53aa4d 100644
--- 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 f59d224026f..a0803575d1e 100755
--- 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 d1c92af8884..eb0cf032c4f 100644
--- 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 3b937f4abb1..08fb93c772e 100755
--- 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 0fb207dc137..d5277842d9f 100644
--- 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 ad38475228f..5c19ba5bbb7 100755
--- 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 0fb207dc137..d5277842d9f 100644
--- 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 8f1715f9edb..3b5bb54dd3f 100755
--- 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 29fa159b5d4..bf89abc6765 100644
--- 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 6a28e2d655d..c1e80c9c527 100755
--- 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 e03b05a6e4a..3c43aa7f277 100644
--- 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 6a28e2d655d..c1e80c9c527 100755
--- 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 e03b05a6e4a..3c43aa7f277 100644
--- 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 0a3797326be..dbc77867318 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-34eff4df0b3dbbfabcd74d5c50c357a6faa280d5
+42c62d342018c7adbc6aae5a6025df322cc03c18