bootstrap: add python3-pyasn1/python3-cryptography for kerberos testing

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Isaac Boukris <iboukris@samba.org>

23 files changed, 46 insertions, 6 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a5efae8cef..0fcbf80cef1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: f5212e7abcae3208b796c939432ab9bec319264a
+  SAMBA_CI_CONTAINER_TAG: 7414ad7ef9108d406b1f6b17ebce19e32aee9f70
   #
   # 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 b862053b915..196f9bdf8eb 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -129,6 +129,7 @@ PKGS = [
     ('mawk', 'gawk'),
 
     ('python3', 'python3'),
+    ('python3-cryptography', 'python3-cryptography'), # for krb5 tests
     ('python3-dev', 'python3-devel'),
     ('python3-dbg', ''),
     ('python3-iso8601', ''),
@@ -137,6 +138,7 @@ PKGS = [
     ('python3-matplotlib', ''),
     ('python3-dnspython', 'python3-dns'),
     ('python3-pexpect', ''),  # for wintest only
+    ('python3-pyasn1', 'python3-pyasn1'), # for krb5 tests
 
     ('', 'libsemanage-python'),
     ('', 'policycoreutils-python'),
@@ -418,9 +420,10 @@ RPM_DISTS = {
         'replace': {
             'lsb-release': 'redhat-lsb',
             'python3': 'python36',
-            'python3-crypto': 'python36-crypto',
+            'python3-cryptography': 'python36-cryptography',
             'python3-devel': 'python36-devel',
             'python3-dns': 'python36-dns',
+            'python3-pyasn1': 'python36-pyasn1',
             'python3-gpg': 'python36-gpg',
             'python3-iso8601' : 'python36-iso8601',
             'python3-markdown': 'python36-markdown',
@@ -455,7 +458,6 @@ RPM_DISTS = {
             'perl-JSON-Parse': '', # does not exist?
             'perl-Test-Base': 'perl-Test-Simple',
             'policycoreutils-python': 'python3-policycoreutils',
-            'python3-crypto': '',
             'quota-devel': '', # FIXME: Add me back, once available!
             'liburing-devel': '', # not available yet, Add me back, once available!
         }
@@ -503,7 +505,6 @@ RPM_DISTS = {
             'perl-interpreter': '',
             'procps-ng': 'procps',
             'python-dns': 'python2-dnspython',
-            'python3-crypto': 'python3-pycrypto',
             'python3-dns': 'python3-dnspython',
             'python3-markdown': 'python3-Markdown',
             'quota-devel': '',
@@ -536,7 +537,6 @@ RPM_DISTS = {
             'perl-interpreter': '',
             'procps-ng': 'procps',
             'python-dns': 'python2-dnspython',
-            'python3-crypto': 'python3-pycrypto',
             'python3-dns': 'python3-dnspython',
             'python3-markdown': 'python3-Markdown',
             'quota-devel': '',
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 2f0bb1bcc28..37f5d684663 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -83,9 +83,11 @@ yum install -y \
     procps-ng \
     psmisc \
     python36 \
+    python36-cryptography \
     python36-devel \
     python36-dns \
     python36-markdown \
+    python36-pyasn1 \
     quota-devel \
     readline-devel \
     redhat-lsb \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 475326b6db7..1b80882bd8c 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -69,9 +69,11 @@ packages:
   - procps-ng
   - psmisc
   - python36
+  - python36-cryptography
   - python36-devel
   - python36-dns
   - python36-markdown
+  - python36-pyasn1
   - quota-devel
   - readline-devel
   - redhat-lsb
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index 22484b3f6ad..61debd5e2ee 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -84,12 +84,14 @@ yum install -y \
     procps-ng \
     psmisc \
     python3 \
+    python3-cryptography \
     python3-devel \
     python3-dns \
     python3-gpg \
     python3-libsemanage \
     python3-markdown \
     python3-policycoreutils \
+    python3-pyasn1 \
     readline-devel \
     redhat-lsb \
     rng-tools \
diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index 07be0deeceb..2467b35dafb 100644
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -69,12 +69,14 @@ packages:
   - procps-ng
   - psmisc
   - python3
+  - python3-cryptography
   - python3-devel
   - python3-dns
   - python3-gpg
   - python3-libsemanage
   - python3-markdown
   - python3-policycoreutils
+  - python3-pyasn1
   - readline-devel
   - redhat-lsb
   - rng-tools
diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh
index f0847eb3c20..9391c1ca815 100755
--- a/bootstrap/generated-dists/debian10/bootstrap.sh
+++ b/bootstrap/generated-dists/debian10/bootstrap.sh
@@ -81,6 +81,7 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
+    python3-cryptography \
     python3-dbg \
     python3-dev \
     python3-dnspython \
@@ -89,6 +90,7 @@ apt-get -y install \
     python3-markdown \
     python3-matplotlib \
     python3-pexpect \
+    python3-pyasn1 \
     rng-tools \
     rsync \
     sed \
diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian10/packages.yml
index a242cd8b362..dee4d5cef20 100644
--- a/bootstrap/generated-dists/debian10/packages.yml
+++ b/bootstrap/generated-dists/debian10/packages.yml
@@ -70,6 +70,7 @@ packages:
   - procps
   - psmisc
   - python3
+  - python3-cryptography
   - python3-dbg
   - python3-dev
   - python3-dnspython
@@ -78,6 +79,7 @@ packages:
   - python3-markdown
   - python3-matplotlib
   - python3-pexpect
+  - python3-pyasn1
   - rng-tools
   - rsync
   - sed
diff --git a/bootstrap/generated-dists/fedora31/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh
index 18c58092eff..09d36e88058 100755
--- a/bootstrap/generated-dists/fedora31/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora31/bootstrap.sh
@@ -83,12 +83,14 @@ dnf install -y \
     procps-ng \
     psmisc \
     python3 \
+    python3-cryptography \
     python3-devel \
     python3-dns \
     python3-gpg \
     python3-libsemanage \
     python3-markdown \
     python3-policycoreutils \
+    python3-pyasn1 \
     quota-devel \
     readline-devel \
     redhat-lsb \
diff --git a/bootstrap/generated-dists/fedora31/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml
index 3165af8dd82..a2fbd0eb83b 100644
--- a/bootstrap/generated-dists/fedora31/packages.yml
+++ b/bootstrap/generated-dists/fedora31/packages.yml
@@ -72,12 +72,14 @@ packages:
   - procps-ng
   - psmisc
   - python3
+  - python3-cryptography
   - python3-devel
   - python3-dns
   - python3-gpg
   - python3-libsemanage
   - python3-markdown
   - python3-policycoreutils
+  - python3-pyasn1
   - quota-devel
   - readline-devel
   - redhat-lsb
diff --git a/bootstrap/generated-dists/fedora32/bootstrap.sh b/bootstrap/generated-dists/fedora32/bootstrap.sh
index 18c58092eff..09d36e88058 100755
--- a/bootstrap/generated-dists/fedora32/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora32/bootstrap.sh
@@ -83,12 +83,14 @@ dnf install -y \
     procps-ng \
     psmisc \
     python3 \
+    python3-cryptography \
     python3-devel \
     python3-dns \
     python3-gpg \
     python3-libsemanage \
     python3-markdown \
     python3-policycoreutils \
+    python3-pyasn1 \
     quota-devel \
     readline-devel \
     redhat-lsb \
diff --git a/bootstrap/generated-dists/fedora32/packages.yml b/bootstrap/generated-dists/fedora32/packages.yml
index 3165af8dd82..a2fbd0eb83b 100644
--- a/bootstrap/generated-dists/fedora32/packages.yml
+++ b/bootstrap/generated-dists/fedora32/packages.yml
@@ -72,12 +72,14 @@ packages:
   - procps-ng
   - psmisc
   - python3
+  - python3-cryptography
   - python3-devel
   - python3-dns
   - python3-gpg
   - python3-libsemanage
   - python3-markdown
   - python3-policycoreutils
+  - python3-pyasn1
   - quota-devel
   - readline-devel
   - redhat-lsb
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 3fbcaacb24f..341b0ef9d35 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -80,9 +80,11 @@ zypper --non-interactive install \
     python2-semanage \
     python3 \
     python3-Markdown \
+    python3-cryptography \
     python3-devel \
     python3-dnspython \
     python3-gpg \
+    python3-pyasn1 \
     readline-devel \
     rng-tools \
     rpcgen \
diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index 0eb19244677..b8c469cadca 100644
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -68,9 +68,11 @@ packages:
   - python2-semanage
   - python3
   - python3-Markdown
+  - python3-cryptography
   - python3-devel
   - python3-dnspython
   - python3-gpg
+  - python3-pyasn1
   - readline-devel
   - rng-tools
   - rpcgen
diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index 3fbcaacb24f..341b0ef9d35 100755
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -80,9 +80,11 @@ zypper --non-interactive install \
     python2-semanage \
     python3 \
     python3-Markdown \
+    python3-cryptography \
     python3-devel \
     python3-dnspython \
     python3-gpg \
+    python3-pyasn1 \
     readline-devel \
     rng-tools \
     rpcgen \
diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index 0eb19244677..b8c469cadca 100644
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -68,9 +68,11 @@ packages:
   - python2-semanage
   - python3
   - python3-Markdown
+  - python3-cryptography
   - python3-devel
   - python3-dnspython
   - python3-gpg
+  - python3-pyasn1
   - readline-devel
   - rng-tools
   - rpcgen
diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index a8f47762ded..f5791357d45 100755
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -80,6 +80,7 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
+    python3-cryptography \
     python3-dbg \
     python3-dev \
     python3-dnspython \
@@ -88,6 +89,7 @@ apt-get -y install \
     python3-markdown \
     python3-matplotlib \
     python3-pexpect \
+    python3-pyasn1 \
     rng-tools \
     rsync \
     sed \
diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index c3cd9af9c3e..932cc162041 100644
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -69,6 +69,7 @@ packages:
   - procps
   - psmisc
   - python3
+  - python3-cryptography
   - python3-dbg
   - python3-dev
   - python3-dnspython
@@ -77,6 +78,7 @@ packages:
   - python3-markdown
   - python3-matplotlib
   - python3-pexpect
+  - python3-pyasn1
   - rng-tools
   - rsync
   - sed
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 97d32815d72..e668057ea82 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -82,6 +82,7 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
+    python3-cryptography \
     python3-dbg \
     python3-dev \
     python3-dnspython \
@@ -90,6 +91,7 @@ apt-get -y install \
     python3-markdown \
     python3-matplotlib \
     python3-pexpect \
+    python3-pyasn1 \
     rng-tools \
     rsync \
     sed \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index f45deb2c808..edf5720f84c 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -71,6 +71,7 @@ packages:
   - procps
   - psmisc
   - python3
+  - python3-cryptography
   - python3-dbg
   - python3-dev
   - python3-dnspython
@@ -79,6 +80,7 @@ packages:
   - python3-markdown
   - python3-matplotlib
   - python3-pexpect
+  - python3-pyasn1
   - rng-tools
   - rsync
   - sed
diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 97d32815d72..e668057ea82 100755
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -82,6 +82,7 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
+    python3-cryptography \
     python3-dbg \
     python3-dev \
     python3-dnspython \
@@ -90,6 +91,7 @@ apt-get -y install \
     python3-markdown \
     python3-matplotlib \
     python3-pexpect \
+    python3-pyasn1 \
     rng-tools \
     rsync \
     sed \
diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index f45deb2c808..edf5720f84c 100644
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -71,6 +71,7 @@ packages:
   - procps
   - psmisc
   - python3
+  - python3-cryptography
   - python3-dbg
   - python3-dev
   - python3-dnspython
@@ -79,6 +80,7 @@ packages:
   - python3-markdown
   - python3-matplotlib
   - python3-pexpect
+  - python3-pyasn1
   - rng-tools
   - rsync
   - sed
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index c3a72eec5c6..085ef7c5297 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-f5212e7abcae3208b796c939432ab9bec319264a
+7414ad7ef9108d406b1f6b17ebce19e32aee9f70