Cherry-pick c852274 with conflicts

.github/workflows/assign_milestone.yml

@@ -12,7 +12,7 @@ env:
 jobs:
  build:
  name: Assign Milestone
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
  permissions:
  pull-requests: write
 

.github/workflows/check_label.yml

@@ -9,7 +9,7 @@ jobs:
  check_pull_request_labels:
  name: Check Pull Request labels
  timeout-minutes: 10
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
  if: github.repository == 'vitessio/vitess'
  steps:
  - name: Release Notes label

.github/workflows/check_make_vtadmin_authz_testgen.yml

@@ -6,7 +6,7 @@ permissions: read-all
 jobs:
  build:
  name: Check Make vtadmin_authz_testgen
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
  steps:
  - name: Skip CI
  run: |

.github/workflows/check_make_vtadmin_web_proto.yml

@@ -6,7 +6,7 @@ permissions: read-all
 jobs:
  build:
  name: Check Make VTAdmin Web Proto
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
  steps:
  - name: Skip CI
  run: |

.github/workflows/close_stale_pull_requests.yml

@@ -9,7 +9,7 @@ permissions: read-all
 
 jobs:
  close_stale_pull_requests:
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
  permissions:
  pull-requests: write
 

.github/workflows/cluster_endtoend_12.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (12)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_13.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (13)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_15.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (15)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_18.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (18)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_21.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (21)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_backup_pitr.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (backup_pitr)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_backup_pitr_xtrabackup.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (backup_pitr_xtrabackup)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (ers_prs_newfeatures_heavy)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_mysql80.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (mysql80)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_mysql_server_vault.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (mysql_server_vault)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_onlineddl_revert.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (onlineddl_revert)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_onlineddl_scheduler.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (onlineddl_scheduler)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_schemadiff_vrepl.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (schemadiff_vrepl)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_tabletmanager_consul.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (tabletmanager_consul)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (tabletmanager_tablegc)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_tabletmanager_throttler_topo.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (tabletmanager_throttler_topo)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_topo_connection_cache.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (topo_connection_cache)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vreplication_across_db_versions)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vreplication_cellalias.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vreplication_cellalias)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vreplication_copy_parallel)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vreplication_foreign_key_stress)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vreplication_mariadb_to_mysql)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vreplication_multi_tenant)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vreplication_partial_movetables_and_materialize)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vreplication_v2.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vreplication_v2)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vstream.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vstream)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtbackup.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtbackup)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtctlbackup_sharded_clustertest_heavy)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_concurrentdml)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_foreignkey_stress.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_foreignkey_stress)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_gen4.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_gen4)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_general_heavy.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_general_heavy)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_godriver.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_godriver)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_partial_keyspace)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_queries.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_queries)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_readafterwrite)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_reservedconn.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_reservedconn)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_schema.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_schema)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI

.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml

@@ -16,7 +16,7 @@ env:
 jobs:
  build:
  name: Run endtoend tests on Cluster (vtgate_schema_tracker)
- runs-on: gh-hosted-runners-4cores-1
+ runs-on: ubuntu-latest
 
  steps:
  - name: Skip CI