Merge branch 'slack-vitess-r14.0.5' into consul-topo-transport-flags-…

…slack-vitess-r14.0.5

.github/workflows/cluster_endtoend_12.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (12)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_13.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (13)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_15.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (15)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_18.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (18)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_19.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (19)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_21.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (21)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_22.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (22)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_24.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (24)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_26.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (26)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (mysql57)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_mysql80.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (mysql80)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_onlineddl_declarative.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_declarative)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_onlineddl_declarative_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_declarative) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_onlineddl_ghost.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_ghost)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_onlineddl_ghost_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_ghost) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_onlineddl_revert.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_revert)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_onlineddl_revert_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_revert) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_onlineddl_revertible.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_revertible)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_onlineddl_revertible_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_revertible) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_onlineddl_scheduler.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_scheduler)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_onlineddl_scheduler_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_scheduler) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_onlineddl_singleton.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_singleton)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_onlineddl_singleton_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_singleton) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_onlineddl_vrepl.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_vrepl)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped
@@ -96,7 +97,7 @@ jobs:
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: nick-fields/retry@v2
       with:
-        timeout_minutes: 60
+        timeout_minutes: 45
         max_attempts: 3
         retry_on: error
         command: |

.github/workflows/cluster_endtoend_onlineddl_vrepl_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_vrepl) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_vrepl_stress)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_vrepl_stress) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_vrepl_stress_suite)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_vrepl_stress_suite) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_vrepl_suite)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_onlineddl_vrepl_suite_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (onlineddl_vrepl_suite) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_resharding.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (resharding)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_resharding_bytes.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (resharding_bytes)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_schemadiff_vrepl.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (schemadiff_vrepl)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_schemadiff_vrepl_mysql57.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (schemadiff_vrepl) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     timeout-minutes: 45
 
     steps:

.github/workflows/cluster_endtoend_shardedrecovery_stress_verticalsplit_heavy.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (shardedrecovery_stress_verticalsplit_heavy)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped
@@ -96,7 +97,7 @@ jobs:
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       uses: nick-fields/retry@v2
       with:
-        timeout_minutes: 60
+        timeout_minutes: 45
         max_attempts: 3
         retry_on: error
         command: |

.github/workflows/cluster_endtoend_tabletmanager_consul.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (tabletmanager_consul)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped

.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   build:
     name: Run endtoend tests on Cluster (tabletmanager_tablegc)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped