From f79a5e66292b44a69d4327d83880543031c299e3 Mon Sep 17 00:00:00 2001
From: Jim Newsome <jnewsome@torproject.org>
Date: Wed, 30 Oct 2024 10:34:58 -0500
Subject: [PATCH] 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).
---
 .gitlab-ci.yml         | 7 ++++++-
 changes/ci-pin-chutney | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 changes/ci-pin-chutney

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82176a1bfd..34f2933928 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,7 +108,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.