Improve the queries upgrade/downgrade CI workflow by using same test …

…code version as binary (#16494)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>

.github/workflows/upgrade_downgrade_test_query_serving_queries.yml

@@ -116,69 +116,57 @@ jobs:
         # install JUnit report formatter
         go install github.com/vitessio/go-junit-report@HEAD
 
-    # Checkout to the last release of Vitess
-    - name: Check out other version's code (${{ steps.output-previous-release-ref.outputs.previous_release_ref }})
-      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ steps.output-previous-release-ref.outputs.previous_release_ref }}
-
-    - name: Get dependencies for the last release
+    # Build current commit's binaries
+    - name: Get dependencies for this commit
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
         go mod download
 
-    - name: Building last release's binaries
+    - name: Building the binaries for this commit
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       timeout-minutes: 10
       run: |
         source build.env
         NOVTADMINBUILD=1 make build
-        mkdir -p /tmp/vitess-build-other/
-        cp -R bin /tmp/vitess-build-other/
+        mkdir -p /tmp/vitess-build-current/
+        cp -R bin /tmp/vitess-build-current/
         rm -Rf bin/*
 
-    # Checkout to this build's commit
-    - name: Check out commit's code
+    # Checkout to the last release of Vitess
+    - name: Check out other version's code (${{ steps.output-previous-release-ref.outputs.previous_release_ref }})
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: actions/checkout@v4
+      with:
+        ref: ${{ steps.output-previous-release-ref.outputs.previous_release_ref }}
 
-    - name: Get dependencies for this commit
+    - name: Get dependencies for the last release
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
         go mod download
 
-    - name: Building the binaries for this commit
+    - name: Building last release's binaries
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       timeout-minutes: 10
       run: |
         source build.env
         NOVTADMINBUILD=1 make build
-        mkdir -p /tmp/vitess-build-current/
-        cp -R bin /tmp/vitess-build-current/
-
-    # Running a test with vtgate and vttablet using version n
-    - name: Run query serving tests (vtgate=N, vttablet=N)
-      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
-      run: |
-        rm -rf /tmp/vtdataroot
-        mkdir -p /tmp/vtdataroot
-
-        source build.env
-        eatmydata -- go run test.go -skip-build -keep-data=false -docker=false -print-log -follow -tag upgrade_downgrade_query_serving_queries
+        mkdir -p /tmp/vitess-build-other/
+        cp -R bin /tmp/vitess-build-other/
+        rm -Rf bin/*
 
     # Swap the binaries in the bin. Use vtgate version n-1 and keep vttablet at version n
     - name: Use last release's VTGate
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
         source build.env
 
+        cp -r /tmp/vitess-build-current/bin/* $PWD/bin/
         rm -f $PWD/bin/vtgate
         cp /tmp/vitess-build-other/bin/vtgate $PWD/bin/vtgate
         vtgate --version
 
-    # Running a test with vtgate at version n-1 and vttablet at version n
-    - name: Run query serving tests (vtgate=N-1, vttablet=N)
+    # Running a test with vtgate at version n-1 and vttablet/vtctld at version n
+    - name: Run query serving tests (vtgate=N-1, vttablet=N, vtctld=N)
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
         rm -rf /tmp/vtdataroot
@@ -187,8 +175,8 @@ jobs:
         source build.env
         eatmydata -- go run test.go -skip-build -keep-data=false -docker=false -print-log -follow -tag upgrade_downgrade_query_serving_queries
 
-    # Swap the binaries again. This time, vtgate will be at version n, and vttablet will be at version n-1
-    - name: Use current version VTGate, and other version VTTablet
+    # Swap the binaries again. This time, vtgate will be at version n, and vttablet/vtctld will be at version n-1
+    - name: Use current version VTGate, and other version VTTablet/VTctld
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
         source build.env
@@ -201,8 +189,8 @@ jobs:
         vtgate --version
         vttablet --version
 
-    # Running a test with vtgate at version n and vttablet at version n-1
-    - name: Run query serving tests (vtgate=N, vttablet=N-1)
+    # Running a test with vtgate at version n and vttablet/vtctld at version n-1
+    - name: Run query serving tests (vtgate=N, vttablet=N-1, vtctld=N-1)
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
         rm -rf /tmp/vtdataroot

.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml

@@ -117,63 +117,51 @@ jobs:
         # install JUnit report formatter
         go install github.com/vitessio/go-junit-report@HEAD
 
-    # Checkout to the next release of Vitess
-    - name: Check out other version's code (${{ steps.output-next-release-ref.outputs.next_release_ref }})
-      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ steps.output-next-release-ref.outputs.next_release_ref }}
-
-    - name: Get dependencies for the next release
+    # Build current commit's binaries
+    - name: Get dependencies for this commit
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
         go mod download
 
-    - name: Building next release's binaries
+    - name: Building the binaries for this commit
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       timeout-minutes: 10
       run: |
         source build.env
         NOVTADMINBUILD=1 make build
-        mkdir -p /tmp/vitess-build-other/
-        cp -R bin /tmp/vitess-build-other/
+        mkdir -p /tmp/vitess-build-current/
+        cp -R bin /tmp/vitess-build-current/
         rm -Rf bin/*
 
-    # Checkout to this build's commit
-    - name: Check out commit's code
+    # Checkout to the next release of Vitess
+    - name: Check out other version's code (${{ steps.output-next-release-ref.outputs.next_release_ref }})
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: actions/checkout@v4
+      with:
+        ref: ${{ steps.output-next-release-ref.outputs.next_release_ref }}
 
-    - name: Get dependencies for this commit
+    - name: Get dependencies for the next release
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
         go mod download
 
-    - name: Building the binaries for this commit
+    - name: Building next release's binaries
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       timeout-minutes: 10
       run: |
         source build.env
         NOVTADMINBUILD=1 make build
-        mkdir -p /tmp/vitess-build-current/
-        cp -R bin /tmp/vitess-build-current/
-
-    # Running a test with vtgate and vttablet using version n
-    - name: Run query serving tests (vtgate=N, vttablet=N)
-      if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
-      run: |
-        rm -rf /tmp/vtdataroot
-        mkdir -p /tmp/vtdataroot
-
-        source build.env
-        eatmydata -- go run test.go -skip-build -keep-data=false -docker=false -print-log -follow -tag upgrade_downgrade_query_serving_queries
+        mkdir -p /tmp/vitess-build-other/
+        cp -R bin /tmp/vitess-build-other/
+        rm -Rf bin/*
 
     # Swap the binaries in the bin. Use vtgate version n+1 and keep vttablet at version n
     - name: Use next release's VTGate
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
         source build.env
 
+        cp -r /tmp/vitess-build-current/bin/* $PWD/bin/
         rm -f $PWD/bin/vtgate
         cp /tmp/vitess-build-other/bin/vtgate $PWD/bin/vtgate
         vtgate --version

go/test/endtoend/backup/vtbackup/backup_only_test.go

@@ -69,15 +69,10 @@ func TestTabletInitialBackup(t *testing.T) {
 	// Initialize the tablets
 	initTablets(t, false, false)
 
-	vtTabletVersion, err := cluster.GetMajorVersion("vttablet")
-	require.NoError(t, err)
-	// For all version at or above v17.0.0, each replica will start in super_read_only mode. Let's verify that is working correctly.
-	if vtTabletVersion >= 17 {
-		err := primary.VttabletProcess.CreateDB("testDB")
-		require.ErrorContains(t, err, "The MySQL server is running with the --super-read-only option so it cannot execute this statement")
-		err = replica1.VttabletProcess.CreateDB("testDB")
-		require.ErrorContains(t, err, "The MySQL server is running with the --super-read-only option so it cannot execute this statement")
-	}
+	err := primary.VttabletProcess.CreateDB("testDB")
+	require.ErrorContains(t, err, "The MySQL server is running with the --super-read-only option so it cannot execute this statement")
+	err = replica1.VttabletProcess.CreateDB("testDB")
+	require.ErrorContains(t, err, "The MySQL server is running with the --super-read-only option so it cannot execute this statement")
 
 	// Restore the Tablet
 	restore(t, primary, "replica", "NOT_SERVING")
@@ -172,7 +167,7 @@ func firstBackupTest(t *testing.T, tabletType string) {
 	restore(t, replica2, "replica", "SERVING")
 	// Replica2 takes time to serve. Sleeping for 5 sec.
 	time.Sleep(5 * time.Second)
-	//check the new replica has the data
+	// check the new replica has the data
 	cluster.VerifyRowsInTablet(t, replica2, keyspaceName, 2)
 
 	removeBackups(t)

go/test/endtoend/cluster/vtctld_process.go

@@ -65,15 +65,10 @@ func (vtctld *VtctldProcess) Setup(cell string, extraArgs ...string) (err error)
 		"--log_dir", vtctld.LogDir,
 		"--port", fmt.Sprintf("%d", vtctld.Port),
 		"--grpc_port", fmt.Sprintf("%d", vtctld.GrpcPort),
+		"--bind-address", "127.0.0.1",
+		"--grpc_bind_address", "127.0.0.1",
 	)
 
-	if v, err := GetMajorVersion("vtctld"); err != nil {
-		return err
-	} else if v >= 18 {
-		vtctld.proc.Args = append(vtctld.proc.Args, "--bind-address", "127.0.0.1")
-		vtctld.proc.Args = append(vtctld.proc.Args, "--grpc_bind_address", "127.0.0.1")
-	}
-
 	if *isCoverage {
 		vtctld.proc.Args = append(vtctld.proc.Args, "--test.coverprofile="+getCoveragePath("vtctld.out"))
 	}

go/test/endtoend/cluster/vtgate_process.go

@@ -85,12 +85,8 @@ func (vtgate *VtgateProcess) Setup() (err error) {
 		"--tablet_types_to_wait", vtgate.TabletTypesToWait,
 		"--service_map", vtgate.ServiceMap,
 		"--mysql_auth_server_impl", vtgate.MySQLAuthServerImpl,
-	}
-	if v, err := GetMajorVersion("vtgate"); err != nil {
-		return err
-	} else if v >= 18 {
-		args = append(args, "--bind-address", "127.0.0.1")
-		args = append(args, "--grpc_bind_address", "127.0.0.1")
+		"--bind-address", "127.0.0.1",
+		"--grpc_bind_address", "127.0.0.1",
 	}
 	// If no explicit mysql_server_version has been specified then we autodetect
 	// the MySQL version that will be used for the test and base the vtgate's

go/test/endtoend/cluster/vtorc_process.go

@@ -126,14 +126,9 @@ func (orc *VTOrcProcess) Setup() (err error) {
 		"--instance-poll-time", "1s",
 		// Faster topo information refresh speeds up the tests. This doesn't add any significant load either
 		"--topo-information-refresh-duration", "3s",
+		"--bind-address", "127.0.0.1",
 	)
 
-	if v, err := GetMajorVersion("vtorc"); err != nil {
-		return err
-	} else if v >= 18 {
-		orc.proc.Args = append(orc.proc.Args, "--bind-address", "127.0.0.1")
-	}
-
 	if *isCoverage {
 		orc.proc.Args = append(orc.proc.Args, "--test.coverprofile="+getCoveragePath("orc.out"))
 	}

go/test/endtoend/cluster/vttablet_process.go

@@ -111,13 +111,9 @@ func (vttablet *VttabletProcess) Setup() (err error) {
 		"--service_map", vttablet.ServiceMap,
 		"--vreplication_tablet_type", vttablet.VreplicationTabletType,
 		"--db_charset", vttablet.Charset,
+		"--bind-address", "127.0.0.1",
+		"--grpc_bind_address", "127.0.0.1",
 	)
-	if v, err := GetMajorVersion("vttablet"); err != nil {
-		return err
-	} else if v >= 18 {
-		vttablet.proc.Args = append(vttablet.proc.Args, "--bind-address", "127.0.0.1")
-		vttablet.proc.Args = append(vttablet.proc.Args, "--grpc_bind_address", "127.0.0.1")
-	}
 
 	if *isCoverage {
 		vttablet.proc.Args = append(vttablet.proc.Args, "--test.coverprofile="+getCoveragePath("vttablet.out"))

go/test/endtoend/reparent/plannedreparent/reparent_test.go

@@ -201,13 +201,13 @@ func TestReparentFromOutsideWithNoPrimary(t *testing.T) {
 }
 
 func reparentFromOutside(t *testing.T, clusterInstance *cluster.LocalProcessCluster, downPrimary bool) {
-	//This test will start a primary and 3 replicas.
-	//Then:
-	//- one replica will be the new primary
-	//- one replica will be reparented to that new primary
-	//- one replica will be busted and dead in the water and we'll call TabletExternallyReparented.
-	//Args:
-	//downPrimary: kills the old primary first
+	// This test will start a primary and 3 replicas.
+	// Then:
+	// - one replica will be the new primary
+	// - one replica will be reparented to that new primary
+	// - one replica will be busted and dead in the water and we'll call TabletExternallyReparented.
+	// Args:
+	// downPrimary: kills the old primary first
 	ctx := context.Background()
 	tablets := clusterInstance.Keyspaces[0].Shards[0].Vttablets
 
@@ -220,7 +220,7 @@ func reparentFromOutside(t *testing.T, clusterInstance *cluster.LocalProcessClus
 		demoteCommands := "SET GLOBAL read_only = ON; FLUSH TABLES WITH READ LOCK; UNLOCK TABLES"
 		utils.RunSQL(ctx, t, demoteCommands, tablets[0])
 
-		//Get the position of the old primary and wait for the new one to catch up.
+		// Get the position of the old primary and wait for the new one to catch up.
 		err := utils.WaitForReplicationPosition(t, tablets[0], tablets[1])
 		require.NoError(t, err)
 	}
@@ -455,14 +455,7 @@ func TestFullStatus(t *testing.T) {
 	assert.Contains(t, primaryStatus.PrimaryStatus.String(), "vt-0000000101-bin")
 	assert.Equal(t, primaryStatus.GtidPurged, "MySQL56/")
 	assert.False(t, primaryStatus.ReadOnly)
-	vtTabletVersion, err := cluster.GetMajorVersion("vttablet")
-	require.NoError(t, err)
-	vtcltlVersion, err := cluster.GetMajorVersion("vtctl")
-	require.NoError(t, err)
-	// For all version at or above v17.0.0, each replica will start in super_read_only mode.
-	if vtTabletVersion >= 17 && vtcltlVersion >= 17 {
-		assert.False(t, primaryStatus.SuperReadOnly)
-	}
+	assert.False(t, primaryStatus.SuperReadOnly)
 	assert.True(t, primaryStatus.SemiSyncPrimaryEnabled)
 	assert.True(t, primaryStatus.SemiSyncReplicaEnabled)
 	assert.True(t, primaryStatus.SemiSyncPrimaryStatus)
@@ -516,10 +509,7 @@ func TestFullStatus(t *testing.T) {
 	assert.Contains(t, replicaStatus.PrimaryStatus.String(), "vt-0000000102-bin")
 	assert.Equal(t, replicaStatus.GtidPurged, "MySQL56/")
 	assert.True(t, replicaStatus.ReadOnly)
-	// For all version at or above v17.0.0, each replica will start in super_read_only mode.
-	if vtTabletVersion >= 17 && vtcltlVersion >= 17 {
-		assert.True(t, replicaStatus.SuperReadOnly)
-	}
+	assert.True(t, replicaStatus.SuperReadOnly)
 	assert.False(t, replicaStatus.SemiSyncPrimaryEnabled)
 	assert.True(t, replicaStatus.SemiSyncReplicaEnabled)
 	assert.False(t, replicaStatus.SemiSyncPrimaryStatus)