From b22ddf5ee9cd06f79cdfee1d34a8ac16c00b1450 Mon Sep 17 00:00:00 2001
From: Ralph Boehme <slow@samba.org>
Date: Fri, 18 Mar 2022 11:47:37 +0100
Subject: [PATCH] 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
---
 .gitlab-ci-main.yml                                | 2 +-
 bootstrap/config.py                                | 1 +
 bootstrap/generated-dists/centos7/bootstrap.sh     | 1 +
 bootstrap/generated-dists/centos7/packages.yml     | 1 +
 bootstrap/generated-dists/centos8s/bootstrap.sh    | 1 +
 bootstrap/generated-dists/centos8s/packages.yml    | 1 +
 bootstrap/generated-dists/debian11/bootstrap.sh    | 1 +
 bootstrap/generated-dists/debian11/packages.yml    | 1 +
 bootstrap/generated-dists/f36mit120/bootstrap.sh   | 1 +
 bootstrap/generated-dists/f36mit120/packages.yml   | 1 +
 bootstrap/generated-dists/fedora36/bootstrap.sh    | 1 +
 bootstrap/generated-dists/fedora36/packages.yml    | 1 +
 bootstrap/generated-dists/opensuse153/bootstrap.sh | 1 +
 bootstrap/generated-dists/opensuse153/packages.yml | 1 +
 bootstrap/generated-dists/ubuntu1804/bootstrap.sh  | 1 +
 bootstrap/generated-dists/ubuntu1804/packages.yml  | 1 +
 bootstrap/generated-dists/ubuntu2004/bootstrap.sh  | 1 +
 bootstrap/generated-dists/ubuntu2004/packages.yml  | 1 +
 bootstrap/sha1sum.txt                              | 2 +-
 19 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 5d8fc1eaaeb..2974212e888 100644
--- 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 d3d16286ab2..a204d1e19c3 100644
--- 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 da39b8a8a61..ad8488b596f 100755
--- 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 76847af609d..09b3d4b3f06 100644
--- 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 7852a8a54b2..cc3d92eaeb4 100755
--- 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 1429d53aa4d..5da7f2ac0d9 100644
--- 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 a0803575d1e..1f9cddfe8ee 100755
--- 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 eb0cf032c4f..e6336463721 100644
--- 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 08fb93c772e..c2bbdb18908 100755
--- 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 d5277842d9f..646a282178a 100644
--- 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 5c19ba5bbb7..32379e34331 100755
--- 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 d5277842d9f..646a282178a 100644
--- 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 3b5bb54dd3f..fb155f18312 100755
--- 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 bf89abc6765..d555584c630 100644
--- 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 c1e80c9c527..56e7b805dfd 100755
--- 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 3c43aa7f277..b42b4d05989 100644
--- 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 c1e80c9c527..56e7b805dfd 100755
--- 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 3c43aa7f277..b42b4d05989 100644
--- 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 3658effe212..ac500bec4f2 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-7232d969a9464e01eac44046eef026210cd27c01
+f0d5c414802246c0df46f9bbbceeda4853fd24b7