From 01f4532bad580774ccfc3ef35a95ddba5d194fdd Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Mon, 20 Jan 2025 13:25:00 -0600
Subject: [PATCH] Revert to use bootstrap version 40 again

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 Makefile                      | 2 +-
 docker/bootstrap/CHANGELOG.md | 2 +-
 test.go                       | 2 +-
 test/templates/dockerfile.tpl | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 378b8708be6..7eb3c9c1d8d 100644
--- a/Makefile
+++ b/Makefile
@@ -286,7 +286,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 # This rule builds the bootstrap images for all flavors.
 DOCKER_IMAGES_FOR_TEST = mysql80 percona80
 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
-BOOTSTRAP_VERSION=41
+BOOTSTRAP_VERSION=40
 ensure_bootstrap_version:
 	find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
 	sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go
diff --git a/docker/bootstrap/CHANGELOG.md b/docker/bootstrap/CHANGELOG.md
index f240d318470..47b7d3a7c88 100644
--- a/docker/bootstrap/CHANGELOG.md
+++ b/docker/bootstrap/CHANGELOG.md
@@ -155,6 +155,6 @@ List of changes between bootstrap image versions.
 ### Changes
 - Update build to golang 1.23.4
 
-## [41] - 2025-01-17
+## [40] - 2025-01-17
 ### Changes
 - Update build to golang 1.23.5
\ No newline at end of file
diff --git a/test.go b/test.go
index ebe0d2ded2d..4922f4f88f1 100755
--- a/test.go
+++ b/test.go
@@ -77,7 +77,7 @@ For example:
 // Flags
 var (
 	flavor           = flag.String("flavor", "mysql80", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors)
-	bootstrapVersion = flag.String("bootstrap-version", "41", "the version identifier to use for the docker images")
+	bootstrapVersion = flag.String("bootstrap-version", "40", "the version identifier to use for the docker images")
 	runCount         = flag.Int("runs", 1, "run each test this many times")
 	retryMax         = flag.Int("retry", 3, "max number of retries, to detect flaky tests")
 	logPass          = flag.Bool("log-pass", false, "log test output even if it passes")
diff --git a/test/templates/dockerfile.tpl b/test/templates/dockerfile.tpl
index 733377418f8..84f084e41e1 100644
--- a/test/templates/dockerfile.tpl
+++ b/test/templates/dockerfile.tpl
@@ -1,4 +1,4 @@
-ARG bootstrap_version=41
+ARG bootstrap_version=40
 ARG image="vitess/bootstrap:${bootstrap_version}-{{.Platform}}"
 
 FROM "${image}"