remove references to MySQL and Percona 5.6 (#10295)

Signed-off-by: deepthi <[email protected]>

Makefile

@@ -255,7 +255,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 = mariadb mariadb103 mysql56 mysql57 mysql80 percona percona57 percona80
+DOCKER_IMAGES_FOR_TEST = mariadb mariadb103 mysql57 mysql80 percona57 percona80
 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
 BOOTSTRAP_VERSION=8
 ensure_bootstrap_version:
@@ -293,7 +293,7 @@ endef
 docker_base:
 	${call build_docker_image,docker/base/Dockerfile,vitess/base}
 
-DOCKER_BASE_SUFFIX = mysql56 mysql80 mariadb mariadb103 percona percona57 percona80
+DOCKER_BASE_SUFFIX = mysql80 mariadb mariadb103 percona57 percona80
 DOCKER_BASE_TARGETS = $(addprefix docker_base_, $(DOCKER_BASE_SUFFIX))
 $(DOCKER_BASE_TARGETS): docker_base_%:
 	${call build_docker_image,docker/base/Dockerfile.$*,vitess/base:$*}
@@ -303,7 +303,7 @@ docker_base_all: docker_base $(DOCKER_BASE_TARGETS)
 docker_lite:
 	${call build_docker_image,docker/lite/Dockerfile,vitess/lite}
 
-DOCKER_LITE_SUFFIX = mysql56 mysql57 ubi7.mysql57 mysql80 ubi7.mysql80 mariadb mariadb103 percona percona57 ubi7.percona57 percona80 ubi7.percona80 alpine testing ubi8.mysql80 ubi8.arm64.mysql80
+DOCKER_LITE_SUFFIX = mysql57 ubi7.mysql57 mysql80 ubi7.mysql80 mariadb mariadb103 percona57 ubi7.percona57 percona80 ubi7.percona80 alpine testing ubi8.mysql80 ubi8.arm64.mysql80
 DOCKER_LITE_TARGETS = $(addprefix docker_lite_,$(DOCKER_LITE_SUFFIX))
 $(DOCKER_LITE_TARGETS): docker_lite_%:
 	${call build_docker_image,docker/lite/Dockerfile.$*,vitess/lite:$*}

docker/bootstrap/README.md

@@ -6,11 +6,12 @@ after successfully running `bootstrap.sh` and `dev.env`.
 The `vitess/bootstrap` image comes in different flavors:
 
 * `vitess/bootstrap:common`    - dependencies that are common to all flavors
-* `vitess/bootstrap:mariadb`   - bootstrap image for MariaDB
-* `vitess/bootstrap:mysql56`   - bootstrap image for MySQL 5.6
+* `vitess/bootstrap:mariadb`   - bootstrap image for MariaDB 10.2
+* `vitess/bootstrap:mariadb103`- bootstrap image for MariaDB 10.3
 * `vitess/bootstrap:mysql57`   - bootstrap image for MySQL 5.7
-* `vitess/bootstrap:percona`   - bootstrap image for Percona Server
+* `vitess/bootstrap:mysql80`   - bootstrap image for MySQL 8.0
 * `vitess/bootstrap:percona57` - bootstrap image for Percona Server 5.7
+* `vitess/bootstrap:percona80` - bootstrap image for Percona Server 8.0
 
 **NOTE: Unlike the base image that builds Vitess itself, this bootstrap image
 will NOT be rebuilt automatically on every push to the Vitess main branch.**
@@ -22,7 +23,7 @@ First build the `common` image, then any flavors you want. For example:
 
 ```sh
 vitess$ docker/bootstrap/build.sh common
-vitess$ docker/bootstrap/build.sh mysql56
+vitess$ docker/bootstrap/build.sh mysql80
 ```
 
 Is it also possible to specify the resulting image name:
@@ -34,13 +35,13 @@ vitess$ docker/bootstrap/build.sh common --image my-common-image
 If custom image names are specified, you might need to set the base image name when building flavors:
 
 ```sh
-vitess$ docker/bootstrap/build.sh mysql56 --base_image my-common-image
+vitess$ docker/bootstrap/build.sh mysql80 --base_image my-common-image
 ```
 
 Both arguments can be combined. For example:
 
 ```sh
-vitess$ docker/bootstrap/build.sh mysql56 --base_image my-common-image --image my-mysql-image
+vitess$ docker/bootstrap/build.sh mysql80 --base_image my-common-image --image my-mysql-image
 ```
 
 ## For Vitess Project Maintainers

docker/bootstrap/build.sh

@@ -18,15 +18,15 @@
 #
 # First build the `common` image, then any flavors you want. For example:
 # $ docker/bootstrap/build.sh common
-# $ docker/bootstrap/build.sh mysql56
+# $ docker/bootstrap/build.sh mysql80
 #
 # Is it also possible to specify the resulting image name:
 # $ docker/bootstrap/build.sh common --image my-common-image
 #
 # If custom image names are specified, you might need to set the base image name when building flavors:
-# $ docker/bootstrap/build.sh mysql56 --base_image my-common-image
+# $ docker/bootstrap/build.sh mysql80 --base_image my-common-image
 # Both arguments can be combined. For example:
-# $ docker/bootstrap/build.sh mysql56 --base_image my-common-image --image my-mysql-image
+# $ docker/bootstrap/build.sh mysql80 --base_image my-common-image --image my-mysql-image
 
 
 flavor=$1

docker/lite/install_dependencies.sh

@@ -65,15 +65,6 @@ apt-get install -y --no-install-recommends "${BASE_PACKAGES[@]}"
 
 # Packages specific to certain flavors.
 case "${FLAVOR}" in
-mysql56)
-    PACKAGES=(
-        libmysqlclient18
-        mysql-client
-        mysql-server
-        libcurl3
-        percona-xtrabackup
-    )
-    ;;
 mysql57)
     mysql57_version=5.7.31
     do_fetch https://repo.mysql.com/apt/debian/pool/mysql-5.7/m/mysql-community/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb /tmp/libmysqlclient20_${mysql57_version}-1debian10_amd64.deb
@@ -153,7 +144,7 @@ esac
 
 # Get GPG keys for extra apt repositories.
 case "${FLAVOR}" in
-mysql56|mysql57|mysql80)
+mysql57|mysql80)
     # repo.mysql.com
     add_apt_key 8C718D3B5072E1F5
     add_apt_key 467B942D3A79BD29
@@ -169,9 +160,6 @@ add_apt_key 9334A25F8507EFA5
 
 # Add extra apt repositories for MySQL.
 case "${FLAVOR}" in
-mysql56)
-    echo 'deb http://repo.mysql.com/apt/debian/ stretch mysql-5.6' > /etc/apt/sources.list.d/mysql.list
-    ;;
 mysql57)
     echo 'deb http://repo.mysql.com/apt/debian/ buster mysql-5.7' > /etc/apt/sources.list.d/mysql.list
     ;;
@@ -188,11 +176,6 @@ esac
 
 # Add extra apt repositories for Percona Server and/or Percona XtraBackup.
 case "${FLAVOR}" in
-percona|mysql56)
-    # 5.6 is no longer supported on buster
-    echo 'deb http://deb.debian.org/debian stretch main' > /etc/apt/sources.list.d/stretch.list
-    echo 'deb http://repo.percona.com/apt stretch main' > /etc/apt/sources.list.d/percona.list
-    ;;
 mysql57|mysql80|percona57)
     echo 'deb http://repo.percona.com/apt buster main' > /etc/apt/sources.list.d/percona.list
     ;;
@@ -204,13 +187,6 @@ esac
 
 # Pre-fill values for installation prompts that are normally interactive.
 case "${FLAVOR}" in
-percona)
-    debconf-set-selections <<EOF
-debconf debconf/frontend select Noninteractive
-percona-server-server-5.6 percona-server-server/root_password password 'unused'
-percona-server-server-5.6 percona-server-server/root_password_again password 'unused'
-EOF
-    ;;
 percona57)
     debconf-set-selections <<EOF
 debconf debconf/frontend select Noninteractive

go/vt/vttablet/tabletmanager/vreplication/vcopier_test.go

@@ -1287,7 +1287,7 @@ func TestPlayerCopyTableCancel(t *testing.T) {
 
 func TestPlayerCopyTablesWithGeneratedColumn(t *testing.T) {
 	flavor := strings.ToLower(env.Flavor)
-	// Disable tests on percona (which identifies as mysql56) and mariadb platforms in CI since they
+	// Disable tests on percona and mariadb platforms in CI since
 	// generated columns support was added in 5.7 and mariadb added mysql compatible generated columns in 10.2
 	if !strings.Contains(flavor, "mysql57") && !strings.Contains(flavor, "mysql80") {
 		return

go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go

@@ -1384,7 +1384,7 @@ func TestPlayerTypes(t *testing.T) {
 	log.Errorf("TestPlayerTypes: flavor is %s", env.Flavor)
 	enableJSONColumnTesting := false
 	flavor := strings.ToLower(env.Flavor)
-	// Disable tests on percona (which identifies as mysql56) and mariadb platforms in CI since they
+	// Disable tests on percona and mariadb platforms in CI since they
 	// either don't support JSON or JSON support is not enabled by default
 	if strings.Contains(flavor, "mysql57") || strings.Contains(flavor, "mysql80") {
 		log.Infof("Running JSON column type tests on flavor %s", flavor)