add percona84 (#18950)

Signed-off-by: Jeremy Doupe <[email protected]>

Author: jdoupe

Makefile

@@ -284,7 +284,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 # Please read docker/README.md to understand the different available images.
 
 # This rule builds the bootstrap images for all flavors.
-DOCKER_IMAGES_FOR_TEST = mysql80 mysql84 percona80
+DOCKER_IMAGES_FOR_TEST = mysql80 mysql84 percona80 percona84
 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
 BOOTSTRAP_VERSION=49
 ensure_bootstrap_version:
@@ -339,7 +339,7 @@ docker_lite:
 docker_mini:
 	${call build_docker_image,docker/mini/Dockerfile,vitess/mini}
 
-DOCKER_VTTESTSERVER_SUFFIX = mysql84
+DOCKER_VTTESTSERVER_SUFFIX = mysql84 percona84
 DOCKER_VTTESTSERVER_TARGETS = $(addprefix docker_vttestserver_,$(DOCKER_VTTESTSERVER_SUFFIX))
 $(DOCKER_VTTESTSERVER_TARGETS): docker_vttestserver_%:
 	${call build_docker_image,docker/vttestserver/Dockerfile.$*,vitess/vttestserver:$*}

docker/lite/Dockerfile.percona84

@@ -0,0 +1,64 @@
+# Copyright 2025 The Vitess Authors.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM --platform=linux/amd64 golang:1.25.3-bookworm AS builder
+
+# Allows docker builds to set the BUILD_NUMBER
+ARG BUILD_NUMBER
+
+# Allows docker builds to set the BUILD_GIT_BRANCH
+ARG BUILD_GIT_BRANCH
+
+# Allows docker builds to set the BUILD_GIT_REV
+ARG BUILD_GIT_REV
+
+# Allows docker builds to set the BUILD_TIME
+ARG BUILD_TIME
+
+WORKDIR /vt/src/vitess.io/vitess
+
+# Create vitess user
+RUN groupadd -r vitess && useradd -r -g vitess vitess
+RUN mkdir -p /vt/vtdataroot /home/vitess
+RUN chown -R vitess:vitess /vt /home/vitess
+USER vitess
+
+# Re-copy sources from working tree.
+COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess
+
+RUN make install PREFIX=/vt/install
+
+# Start over and build the final image.
+FROM --platform=linux/amd64 debian:bookworm-slim
+
+# Install dependencies
+COPY docker/utils/install_dependencies.sh /vt/dist/install_dependencies.sh
+RUN /vt/dist/install_dependencies.sh percona84
+
+# Set up Vitess user and directory tree.
+RUN groupadd -r vitess && useradd -r -g vitess vitess
+RUN mkdir -p /vt/vtdataroot && chown -R vitess:vitess /vt
+
+# Set up Vitess environment (just enough to run pre-built Go binaries)
+ENV VTROOT /vt
+ENV VTDATAROOT /vt/vtdataroot
+ENV PATH $VTROOT/bin:$PATH
+
+# Copy artifacts from builder layer.
+COPY --from=builder --chown=vitess:vitess /vt/install /vt
+COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
+
+# Create mount point for actual data (e.g. MySQL data dir)
+VOLUME /vt/vtdataroot
+USER vitess

docker/utils/install_dependencies.sh

@@ -133,6 +133,15 @@ percona80)
         percona-xtrabackup-80
     )
     ;;
+percona84)
+    PACKAGES=(
+        libperconaserverclient22
+        percona-telemetry-agent
+        percona-server-rocksdb
+        percona-server-server
+        percona-xtrabackup-84
+    )
+    ;;
 *)
     echo "Unknown flavor ${FLAVOR}"
     exit 1
@@ -169,6 +178,12 @@ percona80)
     echo 'deb http://repo.percona.com/apt bookworm main' > /etc/apt/sources.list.d/percona.list
     echo 'deb http://repo.percona.com/ps-80/apt bookworm main' > /etc/apt/sources.list.d/percona80.list
     ;;
+percona84)
+    echo 'deb http://repo.percona.com/apt bookworm main' > /etc/apt/sources.list.d/percona.list
+    echo 'deb http://repo.percona.com/pxb-84-lts/apt bookworm main' >> /etc/apt/sources.list.d/percona.list
+    echo 'deb http://repo.percona.com/telemetry/apt bookworm main' > /etc/apt/sources.list.d/percona-telemetry.list
+    echo 'deb http://repo.percona.com/ps-84-lts/apt bookworm main' > /etc/apt/sources.list.d/percona84.list
+    ;;
 esac
 
 # Pre-fill values for installation prompts that are normally interactive.
@@ -178,6 +193,13 @@ percona80)
 debconf debconf/frontend select Noninteractive
 percona-server-server-8.0 percona-server-server/root_password password 'unused'
 percona-server-server-8.0 percona-server-server/root_password_again password 'unused'
+EOF
+    ;;
+percona84)
+    debconf-set-selections <<EOF
+debconf debconf/frontend select Noninteractive
+percona-server-server-8.4 percona-server-server/root_password password 'unused'
+percona-server-server-8.4 percona-server-server/root_password_again password 'unused'
 EOF
     ;;
 esac

go/tools/go-upgrade/go-upgrade.go

@@ -346,6 +346,7 @@ func replaceGoVersionInCodebase(old, new *version.Version) error {
 		"./docker/lite/Dockerfile.mysql80",
 		"./docker/lite/Dockerfile.mysql84",
 		"./docker/lite/Dockerfile.percona80",
+		"./docker/lite/Dockerfile.percona84",
 		"./docker/vttestserver/Dockerfile.mysql80",
 		"./docker/vttestserver/Dockerfile.mysql84",
 	}

test.go

@@ -114,7 +114,7 @@ const (
 	configFileName = "test/config.json"
 
 	// List of flavors for which a bootstrap Docker image is available.
-	flavors = "mysql80,mysql84,percona80"
+	flavors = "mysql80,mysql84,percona80,percona84"
 )
 
 // Config is the overall object serialized in test/config.json.