fix ci files

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
slackhq · Feb 14, 2025 · ef6d7bf · ef6d7bf
1 parent 7c980ab
commit ef6d7bf
Show file tree

Hide file tree

Showing 42 changed files with 47 additions and 92 deletions.
diff --git a/.github/workflows/assign_milestone.yml b/.github/workflows/assign_milestone.yml
@@ -14,8 +14,7 @@ env:
 jobs:
   build:
     name: Assign Milestone
-    runs-on: 
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code

diff --git a/.github/workflows/check_make_vtadmin_authz_testgen.yml b/.github/workflows/check_make_vtadmin_authz_testgen.yml
@@ -6,8 +6,7 @@ permissions: read-all
 jobs:
   build:
     name: Check Make vtadmin_authz_testgen
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     steps:
     - name: Skip CI
       run: |

diff --git a/.github/workflows/check_make_vtadmin_web_proto.yml b/.github/workflows/check_make_vtadmin_web_proto.yml
@@ -6,8 +6,7 @@ permissions: read-all
 jobs:
   build:
     name: Check Make VTAdmin Web Proto
-    runs-on: 
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     steps:
     - name: Skip CI
       run: |

diff --git a/.github/workflows/close_stale_pull_requests.yml b/.github/workflows/close_stale_pull_requests.yml
@@ -9,8 +9,7 @@ permissions: read-all
 
 jobs:
   close_stale_pull_requests:
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     permissions:
       pull-requests: write
 

diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml
@@ -14,8 +14,7 @@ permissions: read-all
 jobs:
   analyze:
     name: Analyze
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read

diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
@@ -14,8 +14,7 @@ permissions:
 jobs:
   build:
     name: Create Release
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     steps:
     - name: Check out code
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

diff --git a/.github/workflows/docker_build_images.yml b/.github/workflows/docker_build_images.yml
@@ -16,8 +16,7 @@ permissions: read-all
 jobs:
   build_and_push_vttestserver:
     name: Build and push vttestserver
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
     if: github.repository == 'vitessio/vitess'
 
     strategy:
@@ -73,8 +72,7 @@ jobs:
 
   build_and_push_lite:
     name: Build and push lite
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     if: github.repository == 'vitessio/vitess'
 
     strategy:
@@ -138,8 +136,7 @@ jobs:
 
   build_and_push_components:
     name: Build and push
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
     if: github.repository == 'vitessio/vitess' && needs.build_and_push_lite.result == 'success'
     needs:
       - build_and_push_lite
@@ -235,8 +232,7 @@ jobs:
 
   slack_notification:
     name: Slack Notification if failed
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     needs:
       - build_and_push_vttestserver
       - build_and_push_lite
@@ -250,4 +246,4 @@ jobs:
         slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}}
         channel: '#docker-build-notifications'
         name: 'Docker Build Notification'
-        icon_url: https://avatars.githubusercontent.com/u/33043890?s=96&v=4
+        icon_url: https://avatars.githubusercontent.com/u/33043890?s=96&v=4
diff --git a/.github/workflows/docker_test_cluster.yml b/.github/workflows/docker_test_cluster.yml
@@ -5,8 +5,7 @@ jobs:
 
   build:
     name: Docker Test Cluster
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/e2e_race.yml b/.github/workflows/e2e_race.yml
@@ -5,8 +5,7 @@ jobs:
 
   build:
     name: End-to-End Test (Race)
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     steps:
     - name: Skip CI
       run: |

diff --git a/.github/workflows/endtoend.yml b/.github/workflows/endtoend.yml
@@ -5,8 +5,7 @@ jobs:
 
   build:
     name: End-to-End Test
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     steps:
     - name: Skip CI
       run: |

diff --git a/.github/workflows/java_docker_test.yml b/.github/workflows/java_docker_test.yml
@@ -5,8 +5,7 @@ jobs:
 
   build:
     name: Java Docker Test
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml
@@ -5,8 +5,7 @@ jobs:
 
   build:
     name: Local example using ${{ matrix.topo }} on Ubuntu
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
     strategy:
       matrix:
         topo: [consul,etcd,zk2]

diff --git a/.github/workflows/region_example.yml b/.github/workflows/region_example.yml
@@ -5,8 +5,7 @@ jobs:
 
   build:
     name: Region Sharding example using ${{ matrix.topo }} on Ubuntu
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
     strategy:
       matrix:
         topo: [etcd]

diff --git a/.github/workflows/static_checks_etc.yml b/.github/workflows/static_checks_etc.yml
@@ -9,8 +9,7 @@ permissions: read-all
 jobs:
   build:
     name: Static Code Checks Etc
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Skip CI

diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml
@@ -15,8 +15,7 @@ jobs:
 
   build:
     name: Unit Test (Race)
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
     steps:
     - name: Skip CI
       run: |

diff --git a/.github/workflows/unit_race_evalengine.yml b/.github/workflows/unit_race_evalengine.yml
@@ -15,8 +15,7 @@ jobs:
 
   build:
     name: Unit Test (Evalengine_Race)
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
     steps:
     - name: Skip CI
       run: |

diff --git a/.github/workflows/unit_test_evalengine_mysql80.yml b/.github/workflows/unit_test_evalengine_mysql80.yml
@@ -16,8 +16,7 @@ env:
 jobs:
   test:
     name: Unit Test (evalengine_mysql80)
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/unit_test_evalengine_mysql84.yml b/.github/workflows/unit_test_evalengine_mysql84.yml
@@ -16,8 +16,7 @@ env:
 jobs:
   test:
     name: Unit Test (evalengine_mysql84)
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/unit_test_mysql80.yml b/.github/workflows/unit_test_mysql80.yml
@@ -16,8 +16,7 @@ env:
 jobs:
   test:
     name: Unit Test (mysql80)
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/unit_test_mysql84.yml b/.github/workflows/unit_test_mysql84.yml
@@ -16,8 +16,7 @@ env:
 jobs:
   test:
     name: Unit Test (mysql84)
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/update_golang_dependencies.yml b/.github/workflows/update_golang_dependencies.yml
@@ -14,8 +14,7 @@ jobs:
       contents: write
       pull-requests: write
     name: Update Golang Dependencies
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     steps:
       - name: Set up Go
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2

diff --git a/.github/workflows/update_golang_version.yml b/.github/workflows/update_golang_version.yml
@@ -17,8 +17,7 @@ jobs:
       matrix:
         branch: [ main, release-20.0, release-19.0, release-18.0 ]
     name: Update Golang Version
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

diff --git a/.github/workflows/upgrade_downgrade_test_backups_e2e.yml b/.github/workflows/upgrade_downgrade_test_backups_e2e.yml
@@ -13,8 +13,7 @@ jobs:
   upgrade_downgrade_test_e2e:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Backups - E2E
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml b/.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml
@@ -14,8 +14,7 @@ jobs:
   upgrade_downgrade_test_e2e:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Backups - E2E - Next Release
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_backups_manual.yml b/.github/workflows/upgrade_downgrade_test_backups_manual.yml
@@ -15,8 +15,7 @@ jobs:
   upgrade_downgrade_test_manual:
     timeout-minutes: 40
     name: Run Upgrade Downgrade Test - Backups - Manual
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml b/.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml
@@ -15,8 +15,7 @@ jobs:
   upgrade_downgrade_test_manual:
     timeout-minutes: 40
     name: Run Upgrade Downgrade Test - Backups - Manual - Next Release
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_onlineddl_flow.yml b/.github/workflows/upgrade_downgrade_test_onlineddl_flow.yml
@@ -17,8 +17,7 @@ jobs:
   upgrade_downgrade_test:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Online DDL flow
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml
@@ -17,8 +17,7 @@ jobs:
   upgrade_downgrade_test:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Query Serving (Queries)
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries_2.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries_2.yml
@@ -17,8 +17,7 @@ jobs:
   upgrade_downgrade_test:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Query Serving (Queries - 2)
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries_2_next_release.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries_2_next_release.yml
@@ -17,8 +17,7 @@ jobs:
   upgrade_downgrade_test:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Query Serving (Queries - 2) Next Release
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

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
@@ -17,8 +17,7 @@ jobs:
   upgrade_downgrade_test:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Query Serving (Queries) Next Release
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml b/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml
@@ -17,8 +17,7 @@ jobs:
   upgrade_downgrade_test:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Query Serving (Schema)
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

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
@@ -17,8 +17,7 @@ jobs:
   upgrade_downgrade_test:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Query Serving (Schema) Next Release
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml b/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml
@@ -17,8 +17,7 @@ jobs:
   upgrade_downgrade_test:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Reparent New Vtctl
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml b/.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml
@@ -17,8 +17,7 @@ jobs:
   upgrade_downgrade_test:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Reparent New VTTablet
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI

diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml
@@ -17,8 +17,7 @@ jobs:
   upgrade_downgrade_test:
     timeout-minutes: 60
     name: Run Upgrade Downgrade Test - Reparent Old Vtctl
-    runs-on:
-      group: vitess-ubuntu20
+    runs-on: vitess-ubuntu20-16cpu-1
 
     steps:
     - name: Skip CI