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 23be1ef6d7eb3a33d72a0f3aef9c9a0284e7383a..df3ec8ae98408ef72dd003cf2b4c44e98931cd3b 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: 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 0a9fd2a0217ed59940b3a40bf3b1e42f3faf2a58..ae94c75bfa025dd8e356e04c7697e473bf79d0b9 100644 (file)
--- 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 1781cd75b19c301ce7b18cf3cce00baf497c49bd..b7d5f87018b0f2a4139723c9300b8458472fe1df 100755 (executable)
--- 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 1484203648a2233382896afc80468baa610e27e9..b39e3c31dae51ae738274ff71e1432a051a53660 100644 (file)
--- 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 1781cd75b19c301ce7b18cf3cce00baf497c49bd..b7d5f87018b0f2a4139723c9300b8458472fe1df 100755 (executable)
--- 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 1484203648a2233382896afc80468baa610e27e9..b39e3c31dae51ae738274ff71e1432a051a53660 100644 (file)
--- 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 6367f8fa4a08dca824315bb72c0443a54680db60..58d3866fdf25aaf558535354658da4fc70f6a4be 100755 (executable)
--- 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 0c29da539998b1f51f72d44f3ed1662e9ef81694..c7756de7cbdc27a52c3a9f7c1c621e7c54595554 100644 (file)
--- 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 6367f8fa4a08dca824315bb72c0443a54680db60..58d3866fdf25aaf558535354658da4fc70f6a4be 100755 (executable)
--- 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 0c29da539998b1f51f72d44f3ed1662e9ef81694..c7756de7cbdc27a52c3a9f7c1c621e7c54595554 100644 (file)
--- 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 2cb5e686209cd88ee352ec5dfee01175b086377e..53d82f3bb79893a4732bd60294aa74087af694d2 100755 (executable)
--- 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 857ab0f6cfa754d236c52ab72f304ab49d607cf3..cfa24e50a79b5b4b2d6aa27aa6a61e897e0f711a 100644 (file)
--- 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 2cb5e686209cd88ee352ec5dfee01175b086377e..53d82f3bb79893a4732bd60294aa74087af694d2 100755 (executable)
--- 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 857ab0f6cfa754d236c52ab72f304ab49d607cf3..cfa24e50a79b5b4b2d6aa27aa6a61e897e0f711a 100644 (file)
--- 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 2cb5e686209cd88ee352ec5dfee01175b086377e..53d82f3bb79893a4732bd60294aa74087af694d2 100755 (executable)
--- 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 857ab0f6cfa754d236c52ab72f304ab49d607cf3..cfa24e50a79b5b4b2d6aa27aa6a61e897e0f711a 100644 (file)
--- 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 b1039708194e7d973536f1f142ffef0e6620d85b..0b9fd98c48008eb2be86a1bdb1c7be4c19feb8e8 100755 (executable)
--- 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 8ab93b80b2de4c2ddeb235c378f4fa40f5702271..23e416fc1aa5a504fe81896915c5eded8ae1ebf2 100644 (file)
--- 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 b4da7b234d07306b09012e956025660eb9cafc90..56996ed863222ee001269302740164b215f21eec 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-fb63148d63beac20259d0c61ece2c608d2d1d2a1
+d20548dec714e202867b593f5e19f3004f7a2457