From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Mon, 24 Feb 2025 22:30:03 +0000 (+1300)
Subject: bootstrap: remove wintest-only dependency
X-Git-Tag: tevent-0.17.0~613
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f06525afff376bc6081d49c7e97a768e5263199a;p=thirdparty%2Fsamba.git

bootstrap: remove wintest-only dependency

Nobody has run Wintest in the last 10 years, and we don't need it
in our CI tests.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>

Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
Autobuild-Date(master): Thu Feb 27 01:00:10 UTC 2025 on atb-devel-224
---

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 23be1ef6d7e..df3ec8ae984 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: fb63148d63beac20259d0c61ece2c608d2d1d2a1
+  SAMBA_CI_CONTAINER_TAG: d20548dec714e202867b593f5e19f3004f7a2457
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 0a9fd2a0217..ae94c75bfa0 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -151,7 +151,6 @@ PKGS = [
     ('python3-gpg', 'python3-gpg'),  # defaults to ubuntu/fedora latest
     ('python3-markdown', 'python3-markdown'),
     ('python3-dnspython', 'python3-dns'),
-    ('python3-pexpect', ''),  # for wintest only
     ('python3-pyasn1', 'python3-pyasn1'), # for krb5 tests
     ('python3-setproctitle', 'python3-setproctitle'),
     ('python3-requests', 'python3-requests'), # for cert auto enroll
diff --git a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
index 1781cd75b19..b7d5f87018b 100755
--- a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
@@ -97,7 +97,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-pexpect \
     python3-pyasn1 \
     python3-requests \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/debian11-32bit/packages.yml b/bootstrap/generated-dists/debian11-32bit/packages.yml
index 1484203648a..b39e3c31dae 100644
--- a/bootstrap/generated-dists/debian11-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian11-32bit/packages.yml
@@ -86,7 +86,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-pexpect
   - python3-pyasn1
   - python3-requests
   - python3-setproctitle
diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index 1781cd75b19..b7d5f87018b 100755
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -97,7 +97,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-pexpect \
     python3-pyasn1 \
     python3-requests \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index 1484203648a..b39e3c31dae 100644
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -86,7 +86,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-pexpect
   - python3-pyasn1
   - python3-requests
   - python3-setproctitle
diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
index 6367f8fa4a0..58d3866fdf2 100755
--- a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
@@ -96,7 +96,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-pexpect \
     python3-pyasn1 \
     python3-requests \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml b/bootstrap/generated-dists/debian12-32bit/packages.yml
index 0c29da53999..c7756de7cbd 100644
--- a/bootstrap/generated-dists/debian12-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian12-32bit/packages.yml
@@ -85,7 +85,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-pexpect
   - python3-pyasn1
   - python3-requests
   - python3-setproctitle
diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh b/bootstrap/generated-dists/debian12/bootstrap.sh
index 6367f8fa4a0..58d3866fdf2 100755
--- a/bootstrap/generated-dists/debian12/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12/bootstrap.sh
@@ -96,7 +96,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-pexpect \
     python3-pyasn1 \
     python3-requests \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/debian12/packages.yml b/bootstrap/generated-dists/debian12/packages.yml
index 0c29da53999..c7756de7cbd 100644
--- a/bootstrap/generated-dists/debian12/packages.yml
+++ b/bootstrap/generated-dists/debian12/packages.yml
@@ -85,7 +85,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-pexpect
   - python3-pyasn1
   - python3-requests
   - python3-setproctitle
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
index 2cb5e686209..53d82f3bb79 100755
--- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
@@ -98,7 +98,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-pexpect \
     python3-pyasn1 \
     python3-requests \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
index 857ab0f6cfa..cfa24e50a79 100644
--- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
@@ -87,7 +87,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-pexpect
   - python3-pyasn1
   - python3-requests
   - python3-setproctitle
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 2cb5e686209..53d82f3bb79 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -98,7 +98,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-pexpect \
     python3-pyasn1 \
     python3-requests \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 857ab0f6cfa..cfa24e50a79 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -87,7 +87,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-pexpect
   - python3-pyasn1
   - python3-requests
   - python3-setproctitle
diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 2cb5e686209..53d82f3bb79 100755
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -98,7 +98,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-pexpect \
     python3-pyasn1 \
     python3-requests \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index 857ab0f6cfa..cfa24e50a79 100644
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -87,7 +87,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-pexpect
   - python3-pyasn1
   - python3-requests
   - python3-setproctitle
diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
index b1039708194..0b9fd98c480 100755
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
@@ -98,7 +98,6 @@ apt-get -y install \
     python3-gpg \
     python3-iso8601 \
     python3-markdown \
-    python3-pexpect \
     python3-pyasn1 \
     python3-requests \
     python3-setproctitle \
diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml b/bootstrap/generated-dists/ubuntu2204/packages.yml
index 8ab93b80b2d..23e416fc1aa 100644
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2204/packages.yml
@@ -87,7 +87,6 @@ packages:
   - python3-gpg
   - python3-iso8601
   - python3-markdown
-  - python3-pexpect
   - python3-pyasn1
   - python3-requests
   - python3-setproctitle
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index b4da7b234d0..56996ed8632 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-fb63148d63beac20259d0c61ece2c608d2d1d2a1
+d20548dec714e202867b593f5e19f3004f7a2457