bootstrap: Add python3-requests dependency

Certificate Auto Enrollment will depend on
python3-requests in order to fetch the
root chain.

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index ee32c57a3a60b172e98ea5e9504e12acc4718525..95ca23475e6dc098c42176a5667631e564e1f9e2 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 2bfb75bf56b5b40fd57f22b7cfcfdd69d65e4f78
+  SAMBA_CI_CONTAINER_TAG: a4bf899c9709c67254c5bb3964e3dce6bb2e4d1e
   #
   # 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 dc1ff100cfdc2b3db04a21e751c3e1bc28775495..6b3f97d4fd00d99260a0890437acbb51c5833cef 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -144,6 +144,7 @@ PKGS = [
     ('python3-pexpect', ''),  # for wintest only
     ('python3-pyasn1', 'python3-pyasn1'), # for krb5 tests
     ('python3-setproctitle', 'python3-setproctitle'),
+    ('python3-requests', 'python3-requests'), # for cert auto enroll
 
     ('', 'python3-libsemanage'),
     ('', 'python3-policycoreutils'),
@@ -448,6 +449,7 @@ RPM_DISTS = {
             'python3-gpg': 'python36-gpg',
             'python3-iso8601' : 'python36-iso8601',
             'python3-markdown': 'python36-markdown',
+            'python3-requests': 'python36-requests',
             # although python36-devel is available
             # after epel-release installed
             # however, all other python3 pkgs are still python36-ish

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 43572bb532a27df2f8e51132a3e1a7faf5ae1e9b..ebd46784863fb7483cb337926bc7313f57a982e0 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -91,6 +91,7 @@ yum install -y \
     python36-iso8601 \
     python36-markdown \
     python36-pyasn1 \
+    python36-requests \
     python36-setproctitle \
     quota-devel \
     readline-devel \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 3998c875057144d6426114decc7efecc9003d8d6..f8a821f45dca0bdea4d2c3899ef5d7de66cc1464 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -77,6 +77,7 @@ packages:
   - python36-iso8601
   - python36-markdown
   - python36-pyasn1
+  - python36-requests
   - python36-setproctitle
   - quota-devel
   - readline-devel

diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh
index 1111450c400f3cff8b61e089a02dab3e9858a058..5b95521f4389342a6073f9b27541927a2d9d86c1 100755 (executable)
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -99,6 +99,7 @@ yum install -y \
     python3-markdown \
     python3-policycoreutils \
     python3-pyasn1 \
+    python3-requests \
     python3-setproctitle \
     quota-devel \
     readline-devel \

diff --git a/bootstrap/generated-dists/centos8s/packages.yml b/bootstrap/generated-dists/centos8s/packages.yml
index f5d0ac5ffe678678a26b7df438d83c0f9ad7eb2a..79f74bbac51f0feb933f897feec59cd287c053f6 100644 (file)
--- a/bootstrap/generated-dists/centos8s/packages.yml
+++ b/bootstrap/generated-dists/centos8s/packages.yml
@@ -80,6 +80,7 @@ packages:
   - python3-markdown
   - python3-policycoreutils
   - python3-pyasn1
+  - python3-requests
   - python3-setproctitle
   - quota-devel
   - readline-devel

diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index f90cac1c8172b70078ffaa4ca821658b1289aa6d..f59d224026f6c9741dc442cabdd7be789c78b3cf 100755 (executable)
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -93,6 +93,7 @@ apt-get -y install \
     python3-markdown \
     python3-pexpect \
     python3-pyasn1 \
+    python3-requests \
     python3-setproctitle \
     rng-tools \
     rsync \

diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index c98575758ed35378e68e66ca5648a7fcee055f07..d1c92af888498d6815dea2a7d907b8f404d4e1d9 100644 (file)
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -82,6 +82,7 @@ packages:
   - python3-markdown
   - python3-pexpect
   - python3-pyasn1
+  - python3-requests
   - python3-setproctitle
   - rng-tools
   - rsync

diff --git a/bootstrap/generated-dists/f35mit120/bootstrap.sh b/bootstrap/generated-dists/f35mit120/bootstrap.sh
index aa77d63efa02784b3996e5577f0cf2282d7da6c4..3b937f4abb1b7ee822da66c54d56471dfeef31a1 100755 (executable)
--- a/bootstrap/generated-dists/f35mit120/bootstrap.sh
+++ b/bootstrap/generated-dists/f35mit120/bootstrap.sh
@@ -98,6 +98,7 @@ dnf install -y \
     python3-markdown \
     python3-policycoreutils \
     python3-pyasn1 \
+    python3-requests \
     python3-setproctitle \
     quota-devel \
     readline-devel \

diff --git a/bootstrap/generated-dists/f35mit120/packages.yml b/bootstrap/generated-dists/f35mit120/packages.yml
index b4a5ec40ab9a12d012db685c92149da93bf84a0e..0fb207dc137831eb2d198bae6d7623ab6bddfb6e 100644 (file)
--- a/bootstrap/generated-dists/f35mit120/packages.yml
+++ b/bootstrap/generated-dists/f35mit120/packages.yml
@@ -84,6 +84,7 @@ packages:
   - python3-markdown
   - python3-policycoreutils
   - python3-pyasn1
+  - python3-requests
   - python3-setproctitle
   - quota-devel
   - readline-devel

diff --git a/bootstrap/generated-dists/fedora35/bootstrap.sh b/bootstrap/generated-dists/fedora35/bootstrap.sh
index 0d8a3366ab94510941e01f4683ecca6fb28faf7c..ad38475228f21fab112f70ba5f9c0fdd053c206f 100755 (executable)
--- a/bootstrap/generated-dists/fedora35/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora35/bootstrap.sh
@@ -95,6 +95,7 @@ dnf install -y \
     python3-markdown \
     python3-policycoreutils \
     python3-pyasn1 \
+    python3-requests \
     python3-setproctitle \
     quota-devel \
     readline-devel \

diff --git a/bootstrap/generated-dists/fedora35/packages.yml b/bootstrap/generated-dists/fedora35/packages.yml
index b4a5ec40ab9a12d012db685c92149da93bf84a0e..0fb207dc137831eb2d198bae6d7623ab6bddfb6e 100644 (file)
--- a/bootstrap/generated-dists/fedora35/packages.yml
+++ b/bootstrap/generated-dists/fedora35/packages.yml
@@ -84,6 +84,7 @@ packages:
   - python3-markdown
   - python3-policycoreutils
   - python3-pyasn1
+  - python3-requests
   - python3-setproctitle
   - quota-devel
   - readline-devel

diff --git a/bootstrap/generated-dists/opensuse153/bootstrap.sh b/bootstrap/generated-dists/opensuse153/bootstrap.sh
index ffef2d9cd2a9e34218718e2f6e7513fa43ff9426..8f1715f9edbafefab0fb0a38f66117fddf2cc427 100755 (executable)
--- a/bootstrap/generated-dists/opensuse153/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse153/bootstrap.sh
@@ -90,6 +90,7 @@ zypper --non-interactive install \
     python3-policycoreutils \
     python3-pyasn1 \
     python3-python-dateutil \
+    python3-requests \
     python3-setproctitle \
     readline-devel \
     rng-tools \

diff --git a/bootstrap/generated-dists/opensuse153/packages.yml b/bootstrap/generated-dists/opensuse153/packages.yml
index 8198464c43d8b51a7898392ec62b64c64ac6ab1b..29fa159b5d4e2afe61334972f9e8a2a48e9bd5af 100644 (file)
--- a/bootstrap/generated-dists/opensuse153/packages.yml
+++ b/bootstrap/generated-dists/opensuse153/packages.yml
@@ -78,6 +78,7 @@ packages:
   - python3-policycoreutils
   - python3-pyasn1
   - python3-python-dateutil
+  - python3-requests
   - python3-setproctitle
   - readline-devel
   - rng-tools

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index da5e2d7e33509fe0c6ed21ddfe221951c4a79dfd..6a28e2d655d205628f7909388ed84934672843e2 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -93,6 +93,7 @@ apt-get -y install \
     python3-markdown \
     python3-pexpect \
     python3-pyasn1 \
+    python3-requests \
     python3-setproctitle \
     rng-tools \
     rsync \

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index a497af15d59ff8ee9a9ac5644a7cbfe83196ae12..e03b05a6e4a1470e17d6bd6e1e21fb0a293f5dd1 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -82,6 +82,7 @@ packages:
   - python3-markdown
   - python3-pexpect
   - python3-pyasn1
+  - python3-requests
   - python3-setproctitle
   - rng-tools
   - rsync

diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index da5e2d7e33509fe0c6ed21ddfe221951c4a79dfd..6a28e2d655d205628f7909388ed84934672843e2 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -93,6 +93,7 @@ apt-get -y install \
     python3-markdown \
     python3-pexpect \
     python3-pyasn1 \
+    python3-requests \
     python3-setproctitle \
     rng-tools \
     rsync \

diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index a497af15d59ff8ee9a9ac5644a7cbfe83196ae12..e03b05a6e4a1470e17d6bd6e1e21fb0a293f5dd1 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -82,6 +82,7 @@ packages:
   - python3-markdown
   - python3-pexpect
   - python3-pyasn1
+  - python3-requests
   - python3-setproctitle
   - rng-tools
   - rsync

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index b8f70028a2713b10165262f96a682e3a576dcc86..d0359be9b5427958db565217c27ac29959aa790e 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-2bfb75bf56b5b40fd57f22b7cfcfdd69d65e4f78
+a4bf899c9709c67254c5bb3964e3dce6bb2e4d1e