Skip to content

Commit

Permalink
Cherry-pick c852274 with conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
vitess-bot[bot] authored and vitess-bot committed Sep 5, 2024
1 parent d443cf0 commit d4c7408
Show file tree
Hide file tree
Showing 80 changed files with 808 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/assign_milestone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
build:
name: Assign Milestone
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
permissions:
pull-requests: write

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_make_vtadmin_authz_testgen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_make_vtadmin_web_proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/close_stale_pull_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_13.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_15.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_18.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_21.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/cluster_endtoend_22.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ env:

jobs:
build:
<<<<<<< HEAD:.github/workflows/cluster_endtoend_22.yml
name: Run endtoend tests on Cluster (22)
runs-on: gh-hosted-runners-4cores-1
=======
name: Run endtoend tests on Cluster (vstream)
runs-on: ubuntu-latest
>>>>>>> c852274900 (Move from 4-cores larger runners to `ubuntu-latest` (#16714)):.github/workflows/cluster_endtoend_vstream.yml

steps:
- name: Skip CI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_backup_pitr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_mysql80.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_mysql_server_vault.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/cluster_endtoend_onlineddl_ghost.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ env:

jobs:
build:
<<<<<<< HEAD:.github/workflows/cluster_endtoend_onlineddl_ghost.yml
name: Run endtoend tests on Cluster (onlineddl_ghost)
runs-on: gh-hosted-runners-4cores-1
=======
name: Run endtoend tests on Cluster (vreplication_mariadb_to_mysql)
runs-on: ubuntu-latest
>>>>>>> c852274900 (Move from 4-cores larger runners to `ubuntu-latest` (#16714)):.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml

steps:
- name: Skip CI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_onlineddl_revert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_onlineddl_scheduler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_schemadiff_vrepl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/cluster_endtoend_vreplication_multicell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ env:

jobs:
build:
<<<<<<< HEAD:.github/workflows/cluster_endtoend_vreplication_multicell.yml
name: Run endtoend tests on Cluster (vreplication_multicell)
runs-on: gh-hosted-runners-4cores-1
=======
name: Run endtoend tests on Cluster (vreplication_multi_tenant)
runs-on: ubuntu-latest
>>>>>>> c852274900 (Move from 4-cores larger runners to `ubuntu-latest` (#16714)):.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml

steps:
- name: Skip CI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ env:

jobs:
build:
<<<<<<< HEAD:.github/workflows/cluster_endtoend_vreplication_partial_movetables_basic.yml
name: Run endtoend tests on Cluster (vreplication_partial_movetables_basic)
runs-on: gh-hosted-runners-4cores-1
=======
name: Run endtoend tests on Cluster (vreplication_partial_movetables_and_materialize)
runs-on: ubuntu-latest
>>>>>>> c852274900 (Move from 4-cores larger runners to `ubuntu-latest` (#16714)):.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml

steps:
- name: Skip CI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ env:

jobs:
build:
<<<<<<< HEAD:.github/workflows/cluster_endtoend_vreplication_partial_movetables_sequences.yml
name: Run endtoend tests on Cluster (vreplication_partial_movetables_sequences)
runs-on: gh-hosted-runners-4cores-1
=======
name: Run endtoend tests on Cluster (vreplication_copy_parallel)
runs-on: ubuntu-latest
>>>>>>> c852274900 (Move from 4-cores larger runners to `ubuntu-latest` (#16714)):.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml

steps:
- name: Skip CI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_vreplication_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ env:

jobs:
build:
<<<<<<< HEAD:.github/workflows/cluster_endtoend_vstream_with_keyspaces_to_watch.yml
name: Run endtoend tests on Cluster (vstream_with_keyspaces_to_watch)
runs-on: gh-hosted-runners-4cores-1
=======
name: Run endtoend tests on Cluster (vreplication_foreign_key_stress)
runs-on: ubuntu-latest
>>>>>>> c852274900 (Move from 4-cores larger runners to `ubuntu-latest` (#16714)):.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml

steps:
- name: Skip CI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_vtbackup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_vtgate_gen4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_vtgate_godriver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend_vtgate_queries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit d4c7408

Please sign in to comment.