bootstrap: remove wintest-only dependency

douglasbagnall · douglasbagnall · commit f06525afff37 · 2025-02-27T01:00:10.000Z
Nobody has run Wintest in the last 10 years, and we don't need it
in our CI tests.

Signed-off-by: Douglas Bagnall &lt;douglas.bagnall@catalyst.net.nz&gt;
Reviewed-by: Jennifer Sutton &lt;jennifersutton@catalyst.net.nz&gt;

Autobuild-User(master): Douglas Bagnall &lt;dbagnall@samba.org&gt;
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
@@ -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
@@ -151,7 +151,6 @@
     ('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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-fb63148d63beac20259d0c61ece2c608d2d1d2a1
+d20548dec714e202867b593f5e19f3004f7a2457

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ variables:`
`47`	`47`	`# Set this to the contents of bootstrap/sha1sum.txt`
`48`	`48`	`# which is generated by bootstrap/template.py --render`
`49`	`49`	`#`
`50`		`- SAMBA_CI_CONTAINER_TAG: fb63148d63beac20259d0c61ece2c608d2d1d2a1`
	`50`	`+ SAMBA_CI_CONTAINER_TAG: d20548dec714e202867b593f5e19f3004f7a2457`
`51`	`51`	`#`
`52`	`52`	`# We use the ubuntu2204 image as default as`
`53`	`53`	`# it matches what we have on atb-devel-224`