gitlab-ci: Add jq

Pair-Programmed-With: Jule Anger <janger@samba.org>
Signed-off-by: Ralph Boehme <slow@samba.org>
Signed-off-by: Jule Anger <janger@samba.org>
[abartlet@samba.org Regenerated sha1sum after rebase

This commit in aid of future tests for smbstatus JSON output]

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Jun 10 07:51:02 UTC 2022 on sn-devel-184

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 5d8fc1eaaeb69d8def14b8085dbeb06c6568f67c..2974212e888ed5867505ff4eebc3266e038c6e74 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,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: 7232d969a9464e01eac44046eef026210cd27c01
+  SAMBA_CI_CONTAINER_TAG: f0d5c414802246c0df46f9bbbceeda4853fd24b7
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.

diff --git a/bootstrap/config.py b/bootstrap/config.py
index d3d16286ab249eebdab7d607d95e3add2d2d74fa..a204d1e19c3379bd714926d323db3f5b872c038d 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -49,6 +49,7 @@ COMMON = [
     'gzip',
     'hostname',
     'htop',
+    'jq',
     'lcov',
     'make',
     'patch',

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index da39b8a8a61b9b577562877b72213b88bea4c8f1..ad8488b596feef119b45f400cd1dad93f5e55a7a 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -42,6 +42,7 @@ yum install -y \
     hostname \
     htop \
     jansson-devel \
+    jq \
     keyutils-libs-devel \
     krb5-devel \
     krb5-server \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 76847af609d4ec5a5de8a33476f54f70f9b563ad..09b3d4b3f0697a9b678d3fcb93151bf2cf8095cd 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -28,6 +28,7 @@ packages:
   - hostname
   - htop
   - jansson-devel
+  - jq
   - keyutils-libs-devel
   - krb5-devel
   - krb5-server

diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh
index 7852a8a54b26fdc5cda2914891a35a10f85a303d..cc3d92eaeb43fbe2a2bc93339fde4f7fd4bcc493 100755 (executable)
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -50,6 +50,7 @@ yum install -y \
     hostname \
     htop \
     jansson-devel \
+    jq \
     keyutils-libs-devel \
     krb5-devel \
     krb5-server \

diff --git a/bootstrap/generated-dists/centos8s/packages.yml b/bootstrap/generated-dists/centos8s/packages.yml
index 1429d53aa4d343c182b51aef1c653a187466bd57..5da7f2ac0d98a66a0a139a90b88fcfe118b67a34 100644 (file)
--- a/bootstrap/generated-dists/centos8s/packages.yml
+++ b/bootstrap/generated-dists/centos8s/packages.yml
@@ -31,6 +31,7 @@ packages:
   - hostname
   - htop
   - jansson-devel
+  - jq
   - keyutils-libs-devel
   - krb5-devel
   - krb5-server

diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index a0803575d1ed5ba39d0abf3d9e2acdec2eccfe9f..1f9cddfe8eead38ac7f09747bb883518b9c841f7 100755 (executable)
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -35,6 +35,7 @@ apt-get -y install \
     heimdal-multidev \
     hostname \
     htop \
+    jq \
     krb5-config \
     krb5-kdc \
     krb5-user \

diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index eb0cf032c4f624ce7552e94b75cf1b237d32896c..e63364637218481c93c637c4c5def0dca1d45c03 100644 (file)
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -24,6 +24,7 @@ packages:
   - heimdal-multidev
   - hostname
   - htop
+  - jq
   - krb5-config
   - krb5-kdc
   - krb5-user

diff --git a/bootstrap/generated-dists/f36mit120/bootstrap.sh b/bootstrap/generated-dists/f36mit120/bootstrap.sh
index 08fb93c772eb7118e4dd055cd027d9b838bd7ce8..c2bbdb18908006ef9aae7ac8e85d6aa81fa33051 100755 (executable)
--- a/bootstrap/generated-dists/f36mit120/bootstrap.sh
+++ b/bootstrap/generated-dists/f36mit120/bootstrap.sh
@@ -45,6 +45,7 @@ dnf install -y \
     hostname \
     htop \
     jansson-devel \
+    jq \
     keyutils-libs-devel \
     krb5-devel \
     krb5-server \

diff --git a/bootstrap/generated-dists/f36mit120/packages.yml b/bootstrap/generated-dists/f36mit120/packages.yml
index d5277842d9fcdfa9eccf943ed38baf59e5bc3600..646a282178ad0f7676920d3a3fc192ba5ad93bc3 100644 (file)
--- a/bootstrap/generated-dists/f36mit120/packages.yml
+++ b/bootstrap/generated-dists/f36mit120/packages.yml
@@ -31,6 +31,7 @@ packages:
   - hostname
   - htop
   - jansson-devel
+  - jq
   - keyutils-libs-devel
   - krb5-devel
   - krb5-server

diff --git a/bootstrap/generated-dists/fedora36/bootstrap.sh b/bootstrap/generated-dists/fedora36/bootstrap.sh
index 5c19ba5bbb7ac9e62daf0a3122e156a91b893d7b..32379e343319803f7cf7ffcdb368ca4cb4152159 100755 (executable)
--- a/bootstrap/generated-dists/fedora36/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora36/bootstrap.sh
@@ -42,6 +42,7 @@ dnf install -y \
     hostname \
     htop \
     jansson-devel \
+    jq \
     keyutils-libs-devel \
     krb5-devel \
     krb5-server \

diff --git a/bootstrap/generated-dists/fedora36/packages.yml b/bootstrap/generated-dists/fedora36/packages.yml
index d5277842d9fcdfa9eccf943ed38baf59e5bc3600..646a282178ad0f7676920d3a3fc192ba5ad93bc3 100644 (file)
--- a/bootstrap/generated-dists/fedora36/packages.yml
+++ b/bootstrap/generated-dists/fedora36/packages.yml
@@ -31,6 +31,7 @@ packages:
   - hostname
   - htop
   - jansson-devel
+  - jq
   - keyutils-libs-devel
   - krb5-devel
   - krb5-server

diff --git a/bootstrap/generated-dists/opensuse153/bootstrap.sh b/bootstrap/generated-dists/opensuse153/bootstrap.sh
index 3b5bb54dd3f4fc2adccd27b43bdc944593a5f740..fb155f18312481e57ae32624f5345a5373d07fff 100755 (executable)
--- a/bootstrap/generated-dists/opensuse153/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse153/bootstrap.sh
@@ -39,6 +39,7 @@ zypper --non-interactive install \
     gzip \
     hostname \
     htop \
+    jq \
     keyutils-devel \
     krb5-client \
     krb5-devel \

diff --git a/bootstrap/generated-dists/opensuse153/packages.yml b/bootstrap/generated-dists/opensuse153/packages.yml
index bf89abc676523aab9dd536f9e928deb39ea3c23a..d555584c630929257ab13cf1d471df99c1038994 100644 (file)
--- a/bootstrap/generated-dists/opensuse153/packages.yml
+++ b/bootstrap/generated-dists/opensuse153/packages.yml
@@ -27,6 +27,7 @@ packages:
   - gzip
   - hostname
   - htop
+  - jq
   - keyutils-devel
   - krb5-client
   - krb5-devel

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index c1e80c9c527d76734a89776b04af1520d5ef2d5c..56e7b805dfd4bde060098ab37d31e2f898d14189 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -35,6 +35,7 @@ apt-get -y install \
     heimdal-multidev \
     hostname \
     htop \
+    jq \
     krb5-config \
     krb5-kdc \
     krb5-user \

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 3c43aa7f277a3204b012e6f333039ef7cda63413..b42b4d059894a99263f64914fe781ea8020a69c9 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -24,6 +24,7 @@ packages:
   - heimdal-multidev
   - hostname
   - htop
+  - jq
   - krb5-config
   - krb5-kdc
   - krb5-user

diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index c1e80c9c527d76734a89776b04af1520d5ef2d5c..56e7b805dfd4bde060098ab37d31e2f898d14189 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -35,6 +35,7 @@ apt-get -y install \
     heimdal-multidev \
     hostname \
     htop \
+    jq \
     krb5-config \
     krb5-kdc \
     krb5-user \

diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index 3c43aa7f277a3204b012e6f333039ef7cda63413..b42b4d059894a99263f64914fe781ea8020a69c9 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -24,6 +24,7 @@ packages:
   - heimdal-multidev
   - hostname
   - htop
+  - jq
   - krb5-config
   - krb5-kdc
   - krb5-user

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 3658effe212069c1c999a84f74f0e36bb46e5adf..ac500bec4f2300090069f271a23d4ddc4c91f1d7 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-7232d969a9464e01eac44046eef026210cd27c01
+f0d5c414802246c0df46f9bbbceeda4853fd24b7