From: Jim Newsome <jnewsome@torproject.org>
Date: Wed, 30 Oct 2024 15:34:58 +0000 (-0500)
Subject: CI: use a fixed version of chutney
X-Git-Tag: tor-0.4.8.15~4^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8cab382ef18ce2fdacd03543ec2f84d10b80fea;p=thirdparty%2Ftor.git

CI: use a fixed version of chutney

While chutney currently runs tor's chutney test in its own CI,
it's difficult to guarantee the two won't accidentally diverge.
Probably best to use a fixed version here so that we can control
chutney version bumps and avoid surprise breakage in tor's CI.

This will also free us to intentionally make breaking changes in
chutney (though I don't have any immediate plans for any).
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0372c4015b..a595788320 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,7 +107,12 @@ variables:
     # TODO: This next line should not be debian-only.
     - |
       if [ "$CHUTNEY" = yes ]; then
-        git clone --depth 1 https://gitlab.torproject.org/tpo/core/chutney.git
+        # Use a fixed version of chutney to avoid surprise breakage.
+        CHUTNEY_SHALLOW_SINCE=2024-10-28
+        CHUTNEY_COMMIT=be881a1e7c4bc8038fa13fde4a7b24e5c56349c4
+
+        git clone --shallow-since "$CHUTNEY_SHALLOW_SINCE" https://gitlab.torproject.org/tpo/core/chutney.git
+        git -C ./chutney checkout "$CHUTNEY_COMMIT"
         export CHUTNEY_PATH="$(pwd)/chutney"
         # Have pip install chutney's python dependencies by installing chutney
         # itself.
diff --git a/changes/ci-pin-chutney b/changes/ci-pin-chutney
new file mode 100644
index 0000000000..f572de9d92
--- /dev/null
+++ b/changes/ci-pin-chutney
@@ -0,0 +1,3 @@
+  o Minor feature (testing, CI):
+    - Use a fixed version of chutney (be881a1e) instead of its current HEAD.
+      This version should also be preferred when testing locally.