fix E2E for PDMS and BR

tests/e2e/br/br.go

@@ -901,7 +901,7 @@ func getPDServiceResourceName(tcName string) string {
 func createTidbCluster(f *e2eframework.Framework, name string, version string, enableTLS bool, skipCA bool) error {
 	ns := f.Namespace.Name
 	// TODO: change to use tidbclusterutil like brutil
-	tc := fixture.GetTidbCluster(ns, name, version)
+	tc := fixture.GetTidbClusterWithoutPDMS(ns, name, version)
 	tc.Spec.PD.Replicas = 1
 	tc.Spec.TiKV.Replicas = 1
 	tc.Spec.TiDB.Replicas = 1

tests/e2e/br/framework/br/data.go

@@ -128,6 +128,10 @@ func GetBackup(ns, name, tcName, typ string, s3Config *v1alpha1.S3StorageProvide
 				Cluster:          tcName,
 				ClusterNamespace: ns,
 				SendCredToTikv:   &sendCredToTikv,
+				Options: []string{
+					// ref: https://docs.pingcap.com/tidb/stable/backup-and-restore-overview#version-compatibility
+					"--with-sys-table=false",
+				},
 			},
 			CleanPolicy: v1alpha1.CleanPolicyTypeDelete,
 		},

tests/e2e/tidbcluster/tidbcluster.go

@@ -3136,7 +3136,7 @@ var _ = ginkgo.Describe("TiDBCluster", func() {
 
 			ginkgo.It("migrate start script from v1 to v2 "+testcase.nameSuffix, func() {
 				tcName := "migrate-start-script-v2"
-				tc := fixture.GetTidbCluster(ns, tcName, utilimage.TiDBLatest)
+				tc := fixture.GetTidbClusterWithoutPDMS(ns, tcName, utilimage.TiDBLatest)
 				tc = fixture.AddTiFlashForTidbCluster(tc)
 				tc = fixture.AddTiCDCForTidbCluster(tc)
 				tc = fixture.AddPumpForTidbCluster(tc)

tests/pkg/fixture/fixture.go

@@ -84,6 +84,22 @@ const ComponentCustomKey = "component-test-key"
 
 // GetTidbCluster returns a TidbCluster resource configured for testing
 func GetTidbCluster(ns, name, version string) *v1alpha1.TidbCluster {
+	tc := GetTidbClusterWithoutPDMS(ns, name, version)
+
+	random := rand.Intn(2)
+	if random != 0 && version == utilimage.PDMSImage {
+		log.Logf("[GetTidbCluster] tidbcluster's pd mode is micro-service in this situation, "+
+			"version: %s, tc name: %s, namespace: %s", version, name, ns)
+		// 50% random in pdms mode
+		tc = AddPDMSForTidbCluster(tc)
+	}
+
+	return tc
+}
+
+// GetTidbClusterWithoutPDMS returns a TidbCluster resource configured for testing.
+// in some cases, it won't support pdms mode, so we can't use pdms mode in this situation.
+func GetTidbClusterWithoutPDMS(ns, name, version string) *v1alpha1.TidbCluster {
 	// We assume all unparsable versions are greater or equal to v4.0.0-beta,
 	// e.g. nightly.
 	tikvConfig := v1alpha1.NewTiKVConfig()
@@ -193,14 +209,6 @@ func GetTidbCluster(ns, name, version string) *v1alpha1.TidbCluster {
 		},
 	}
 
-	random := rand.Intn(2)
-	if random != 0 && version == utilimage.PDMSImage {
-		log.Logf("[GetTidbCluster] tidbcluster's pd mode is micro-service in this situation, "+
-			"version: %s, tc name: %s, namespace: %s", version, name, ns)
-		// 50% random in pdms mode
-		tc = AddPDMSForTidbCluster(tc)
-	}
-
 	return tc
 }