From 50b2d908125924a659575e77b98fbdbaad34882a Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 12 Jul 2023 13:49:51 +0200 Subject: [PATCH] Move more jobs to runner group Signed-off-by: Tim Vaillancourt --- .github/workflows/cluster_endtoend_26.yml | 3 ++- ...ster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml | 3 ++- .github/workflows/cluster_endtoend_vtbackup_transform.yml | 3 ++- .../workflows/cluster_endtoend_vtgate_partial_keyspace.yml | 3 ++- .github/workflows/cluster_endtoend_xb_backup_mysql57.yml | 3 ++- .github/workflows/cluster_endtoend_xb_recovery_mysql57.yml | 3 ++- .github/workflows/cluster_initial_sharding_multi.yml | 3 ++- .github/workflows/docker_test_cluster_10.yml | 3 ++- .github/workflows/docker_test_cluster_25.yml | 3 ++- .github/workflows/e2e_race.yml | 3 ++- .github/workflows/endtoend.yml | 3 ++- .github/workflows/unit_race.yml | 3 ++- .github/workflows/upgrade_downgrade_test_backups_e2e.yml | 6 ++++-- .../upgrade_downgrade_test_backups_e2e_next_release.yml | 6 ++++-- .github/workflows/upgrade_downgrade_test_backups_manual.yml | 6 ++++-- .../upgrade_downgrade_test_backups_manual_next_release.yml | 6 ++++-- .../upgrade_downgrade_test_query_serving_queries.yml | 6 ++++-- ...de_downgrade_test_query_serving_queries_next_release.yml | 6 ++++-- .../upgrade_downgrade_test_query_serving_schema.yml | 6 ++++-- ...ade_downgrade_test_query_serving_schema_next_release.yml | 6 ++++-- .../workflows/upgrade_downgrade_test_reparent_new_vtctl.yml | 6 ++++-- .../upgrade_downgrade_test_reparent_new_vttablet.yml | 6 ++++-- .../workflows/upgrade_downgrade_test_reparent_old_vtctl.yml | 6 ++++-- .../upgrade_downgrade_test_reparent_old_vttablet.yml | 6 ++++-- 24 files changed, 72 insertions(+), 36 deletions(-) diff --git a/.github/workflows/cluster_endtoend_26.yml b/.github/workflows/cluster_endtoend_26.yml index aa84f9c7760..32c2f897688 100644 --- a/.github/workflows/cluster_endtoend_26.yml +++ b/.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-ubuntu22 steps: - name: Check if workflow needs to be skipped diff --git a/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml b/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml index 8f22b74f779..e7ed26ad624 100644 --- a/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml +++ b/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml @@ -14,7 +14,8 @@ env: jobs: build: name: Run endtoend tests on Cluster (vreplication_migrate_vdiff2_convert_tz) - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped diff --git a/.github/workflows/cluster_endtoend_vtbackup_transform.yml b/.github/workflows/cluster_endtoend_vtbackup_transform.yml index e72f35573e3..ae4603614fb 100644 --- a/.github/workflows/cluster_endtoend_vtbackup_transform.yml +++ b/.github/workflows/cluster_endtoend_vtbackup_transform.yml @@ -14,7 +14,8 @@ env: jobs: build: name: Run endtoend tests on Cluster (vtbackup_transform) - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped diff --git a/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml b/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml index 9961b4f8155..350e4503ada 100644 --- a/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml +++ b/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml @@ -14,7 +14,8 @@ env: jobs: build: name: Run endtoend tests on Cluster (vtgate_partial_keyspace) - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped diff --git a/.github/workflows/cluster_endtoend_xb_backup_mysql57.yml b/.github/workflows/cluster_endtoend_xb_backup_mysql57.yml index d6b159cdf72..76d5a26b78c 100644 --- a/.github/workflows/cluster_endtoend_xb_backup_mysql57.yml +++ b/.github/workflows/cluster_endtoend_xb_backup_mysql57.yml @@ -18,7 +18,8 @@ env: jobs: build: name: Run endtoend tests on Cluster (xb_backup) mysql57 - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped diff --git a/.github/workflows/cluster_endtoend_xb_recovery_mysql57.yml b/.github/workflows/cluster_endtoend_xb_recovery_mysql57.yml index 4a6653121f8..b57e47df42f 100644 --- a/.github/workflows/cluster_endtoend_xb_recovery_mysql57.yml +++ b/.github/workflows/cluster_endtoend_xb_recovery_mysql57.yml @@ -18,7 +18,8 @@ env: jobs: build: name: Run endtoend tests on Cluster (xb_recovery) mysql57 - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped diff --git a/.github/workflows/cluster_initial_sharding_multi.yml b/.github/workflows/cluster_initial_sharding_multi.yml index e8ea8a44edf..100200ef061 100644 --- a/.github/workflows/cluster_initial_sharding_multi.yml +++ b/.github/workflows/cluster_initial_sharding_multi.yml @@ -4,7 +4,8 @@ jobs: build: name: cluster initial sharding multi - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped diff --git a/.github/workflows/docker_test_cluster_10.yml b/.github/workflows/docker_test_cluster_10.yml index ba587d6aa8b..7081c360b26 100644 --- a/.github/workflows/docker_test_cluster_10.yml +++ b/.github/workflows/docker_test_cluster_10.yml @@ -4,7 +4,8 @@ jobs: build: name: Docker Test Cluster 10 - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped diff --git a/.github/workflows/docker_test_cluster_25.yml b/.github/workflows/docker_test_cluster_25.yml index 4e0311c751d..abe71e6fa15 100644 --- a/.github/workflows/docker_test_cluster_25.yml +++ b/.github/workflows/docker_test_cluster_25.yml @@ -4,7 +4,8 @@ jobs: build: name: Docker Test Cluster 25 - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped diff --git a/.github/workflows/e2e_race.yml b/.github/workflows/e2e_race.yml index fa45b9aee4e..9174ccb0357 100644 --- a/.github/workflows/e2e_race.yml +++ b/.github/workflows/e2e_race.yml @@ -4,7 +4,8 @@ jobs: build: name: End-to-End Test (Race) - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped id: skip-workflow diff --git a/.github/workflows/endtoend.yml b/.github/workflows/endtoend.yml index bc6d21eef67..588a894cdab 100644 --- a/.github/workflows/endtoend.yml +++ b/.github/workflows/endtoend.yml @@ -4,7 +4,8 @@ jobs: build: name: End-to-End Test - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped id: skip-workflow diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml index e9ed81e360c..8e3209e51a2 100644 --- a/.github/workflows/unit_race.yml +++ b/.github/workflows/unit_race.yml @@ -8,7 +8,8 @@ jobs: build: name: Unit Test (Race) - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 steps: - name: Check if workflow needs to be skipped id: skip-workflow diff --git a/.github/workflows/upgrade_downgrade_test_backups_e2e.yml b/.github/workflows/upgrade_downgrade_test_backups_e2e.yml index daf1af32a2a..4661a3ef048 100644 --- a/.github/workflows/upgrade_downgrade_test_backups_e2e.yml +++ b/.github/workflows/upgrade_downgrade_test_backups_e2e.yml @@ -11,7 +11,8 @@ jobs: get_previous_release: if: always() name: Get Previous Release - Backups - E2E - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 needs: - get_upgrade_downgrade_label outputs: @@ -34,7 +35,8 @@ jobs: timeout-minutes: 60 if: always() && needs.get_previous_release.result == 'success' name: Run Upgrade Downgrade Test - Backups - E2E - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 needs: - get_previous_release diff --git a/.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml b/.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml index e7c8d42ebdc..66cd44ff957 100644 --- a/.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml @@ -11,7 +11,8 @@ jobs: get_next_release: if: always() name: Get Latest Release - Backups - E2E - Next Release - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 outputs: next_release: ${{ steps.output-next-release-ref.outputs.next_release_ref }} @@ -32,7 +33,8 @@ jobs: timeout-minutes: 60 if: always() && needs.get_next_release.result == 'success' name: Run Upgrade Downgrade Test - Backups - E2E - Next Release - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 needs: - get_next_release diff --git a/.github/workflows/upgrade_downgrade_test_backups_manual.yml b/.github/workflows/upgrade_downgrade_test_backups_manual.yml index dc61c682a6b..8bdd95d3c7e 100644 --- a/.github/workflows/upgrade_downgrade_test_backups_manual.yml +++ b/.github/workflows/upgrade_downgrade_test_backups_manual.yml @@ -11,7 +11,8 @@ jobs: get_previous_release: if: always() name: Get Previous Release - Backups - Manual - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 outputs: previous_release: ${{ steps.output-previous-release-ref.outputs.previous_release_ref }} @@ -33,7 +34,8 @@ jobs: timeout-minutes: 40 if: always() && (needs.get_previous_release.result == 'success') name: Run Upgrade Downgrade Test - Backups - Manual - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 needs: - get_previous_release diff --git a/.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml b/.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml index c6d1f6b6d93..77ca929bdb7 100644 --- a/.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml @@ -11,7 +11,8 @@ jobs: get_next_release: if: always() name: Get Previous Release - Backups - Manual - Next Release - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 outputs: next_release: ${{ steps.output-next-release-ref.outputs.next_release_ref }} @@ -33,7 +34,8 @@ jobs: timeout-minutes: 40 if: always() && (needs.get_next_release.result == 'success') name: Run Upgrade Downgrade Test - Backups - Manual - Next Release - runs-on: ubuntu-20.04 + runs-on: + group: vitess-ubuntu22 needs: - get_next_release diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml index afbecc8aca1..e6c579af72b 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml @@ -14,7 +14,8 @@ jobs: get_previous_release: if: always() name: Get Previous Release - Query Serving (Queries) - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 outputs: previous_release: ${{ steps.output-previous-release-ref.outputs.previous_release_ref }} @@ -34,7 +35,8 @@ jobs: upgrade_downgrade_test: if: always() && (needs.get_previous_release.result == 'success') name: Run Upgrade Downgrade Test - Query Serving (Queries) - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 needs: - get_previous_release diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml index 9086344400b..9a79322cb14 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml @@ -14,7 +14,8 @@ jobs: get_next_release: if: always() name: Get Latest Release - Query Serving (Queries) Next Release - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 outputs: next_release: ${{ steps.output-next-release-ref.outputs.next_release_ref }} @@ -34,7 +35,8 @@ jobs: upgrade_downgrade_test: if: always() && (needs.get_next_release.result == 'success') name: Run Upgrade Downgrade Test - Query Serving (Queries) Next Release - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 needs: - get_next_release diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml b/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml index a49d513f39b..49844abe65b 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml @@ -14,7 +14,8 @@ jobs: get_previous_release: if: always() name: Get Previous Release - Query Serving (Schema) - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 outputs: previous_release: ${{ steps.output-previous-release-ref.outputs.previous_release_ref }} @@ -34,7 +35,8 @@ jobs: upgrade_downgrade_test: if: always() && (needs.get_previous_release.result == 'success') name: Run Upgrade Downgrade Test - Query Serving (Schema) - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 needs: - get_previous_release diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml b/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml index a87aa824563..4f478147560 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml @@ -14,7 +14,8 @@ jobs: get_next_release: if: always() name: Get Latest Release - Query Serving (Schema) Next Release - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 outputs: next_release: ${{ steps.output-next-release-ref.outputs.next_release_ref }} @@ -34,7 +35,8 @@ jobs: upgrade_downgrade_test: if: always() && (needs.get_next_release.result == 'success') name: Run Upgrade Downgrade Test - Query Serving (Schema) Next Release - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 needs: - get_next_release diff --git a/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml b/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml index b722220b340..c5032465143 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml @@ -14,7 +14,8 @@ jobs: get_next_release: if: always() name: Get Latest Release - Reparent New Vtctl - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 outputs: next_release: ${{ steps.output-next-release-ref.outputs.next_release_ref }} @@ -34,7 +35,8 @@ jobs: upgrade_downgrade_test: if: always() && (needs.get_next_release.result == 'success') name: Run Upgrade Downgrade Test - Reparent New Vtctl - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 needs: - get_next_release diff --git a/.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml b/.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml index a3b7ff67a23..24be098da42 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml @@ -14,7 +14,8 @@ jobs: get_next_release: if: always() name: Get Latest Release - Reparent New VTTablet - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 outputs: next_release: ${{ steps.output-next-release-ref.outputs.next_release_ref }} @@ -34,7 +35,8 @@ jobs: upgrade_downgrade_test: if: always() && (needs.get_next_release.result == 'success') name: Run Upgrade Downgrade Test - Reparent New VTTablet - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 needs: - get_next_release diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml index c1ec4153681..4d9733fab6e 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml @@ -14,7 +14,8 @@ jobs: get_previous_release: if: always() name: Get Previous Release - Reparent Old Vtctl - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 outputs: previous_release: ${{ steps.output-previous-release-ref.outputs.previous_release_ref }} @@ -34,7 +35,8 @@ jobs: upgrade_downgrade_test: if: always() && (needs.get_previous_release.result == 'success') name: Run Upgrade Downgrade Test - Reparent Old Vtctl - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 needs: - get_previous_release diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml index b8a557585be..30e97eb46d6 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml @@ -14,7 +14,8 @@ jobs: get_previous_release: if: always() name: Get Previous Release - Reparent Old VTTablet - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 outputs: previous_release: ${{ steps.output-previous-release-ref.outputs.previous_release_ref }} @@ -34,7 +35,8 @@ jobs: upgrade_downgrade_test: if: always() && (needs.get_previous_release.result == 'success') name: Run Upgrade Downgrade Test - Reparent Old VTTablet - runs-on: ubuntu-latest + runs-on: + group: vitess-ubuntu22 needs: - get_previous_release