From b37f496eab8ab4fb4f2420d22900b90a4cb80d4d Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Sun, 25 Apr 2021 13:31:48 +0300
Subject: [PATCH] Fixing flaky endtoend/tablegc tests

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
---
 ...nd_27.yml => cluster_endtoend_tabletmanager_tablegc.yml} | 6 +++---
 test/ci_workflow_gen.go                                     | 2 +-
 test/config.json                                            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename .github/workflows/{cluster_endtoend_27.yml => cluster_endtoend_tabletmanager_tablegc.yml} (92%)

diff --git a/.github/workflows/cluster_endtoend_27.yml b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
similarity index 92%
rename from .github/workflows/cluster_endtoend_27.yml
rename to .github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
index dea2e7336b..629a2f0cdc 100644
--- a/.github/workflows/cluster_endtoend_27.yml
+++ b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml
@@ -1,11 +1,11 @@
 # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows"
 
-name: Cluster (27)
+name: Cluster (tabletmanager_tablegc)
 on: [push, pull_request]
 jobs:
 
   build:
-    name: Run endtoend tests on Cluster (27)
+    name: Run endtoend tests on Cluster (tabletmanager_tablegc)
     runs-on: ubuntu-18.04
 
     steps:
@@ -47,4 +47,4 @@ jobs:
       timeout-minutes: 30
       run: |
         source build.env
-        eatmydata -- go run test.go -docker=false -print-log -follow -shard 27
+        eatmydata -- go run test.go -docker=false -print-log -follow -shard tabletmanager_tablegc
diff --git a/test/ci_workflow_gen.go b/test/ci_workflow_gen.go
index 45170806b7..ef914104bb 100644
--- a/test/ci_workflow_gen.go
+++ b/test/ci_workflow_gen.go
@@ -51,7 +51,6 @@ var (
 		"23",
 		"24",
 		"26",
-		"27",
 		"vreplication_basic",
 		"vreplication_multicell",
 		"vreplication_cellalias",
@@ -65,6 +64,7 @@ var (
 		"onlineddl_singleton",
 		"tabletmanager_throttler",
 		"tabletmanager_throttler_custom_config",
+		"tabletmanager_tablegc",
 	}
 	// TODO: currently some percona tools including xtrabackup are installed on all clusters, we can possibly optimize
 	// this by only installing them in the required clusters
diff --git a/test/config.json b/test/config.json
index f0cfd18bf8..c309b9df21 100644
--- a/test/config.json
+++ b/test/config.json
@@ -522,7 +522,7 @@
 			"Args": ["vitess.io/vitess/go/test/endtoend/tabletmanager/tablegc"],
 			"Command": [],
 			"Manual": false,
-			"Shard": "27",
+			"Shard": "tabletmanager_tablegc",
 			"RetryMax": 0,
 			"Tags": [
 				"site_test"