use runs-on for replay-verify workflows

aptos-labs · Oct 3, 2024 · b6e1c3e · b6e1c3e
1 parent 628e88b
commit b6e1c3e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/replay-verify.yaml b/.github/workflows/replay-verify.yaml
@@ -35,6 +35,9 @@ on:
   schedule:
     - cron: "0 22 * * 0,2,4" # The main branch cadence. This runs every Sun,Tues,Thurs
 
+permissions:
+  id-token: write
+
 # cancel redundant builds
 concurrency:
   # cancel redundant builds on PRs (only on PR, not on branches)
@@ -71,7 +74,7 @@ jobs:
       RANGES_TO_SKIP: "1195000000-1220000000"
       BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/gcs.yaml
       # workflow config
-      RUNS_ON: "high-perf-docker-with-local-ssd"
+      RUNS_ON: "runs-on,cpu=96,family=c5d+c5ad,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=false"
       TIMEOUT_MINUTES: 180
       MAX_VERSIONS_PER_RANGE: 2000000
 
@@ -95,7 +98,7 @@ jobs:
       RANGES_TO_SKIP: "1197378568-1198492648"
       BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/gcs.yaml
       # workflow config
-      RUNS_ON: "high-perf-docker-with-local-ssd"
+      RUNS_ON: "runs-on,cpu=96,family=c5d+c5ad,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=false"
       TIMEOUT_MINUTES: 180
       MAX_VERSIONS_PER_RANGE: 800000
 
@@ -116,6 +119,6 @@ jobs:
       RANGES_TO_SKIP: "1195000000-1220000000"
       BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/gcs.yaml
       # workflow config
-      RUNS_ON: "high-perf-docker-with-local-ssd"
+      RUNS_ON: "runs-on,cpu=96,family=c5d+c5ad,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=false"
       TIMEOUT_MINUTES: 120 # increase test replay timeout to capture more flaky errors
       MAX_VERSIONS_PER_RANGE: 2000000
diff --git a/.github/workflows/workflow-run-replay-verify.yaml b/.github/workflows/workflow-run-replay-verify.yaml
@@ -126,11 +126,11 @@ jobs:
           strip -s target/release/aptos-debugger
           cp target/release/aptos-debugger .
 
-      - name: Install GCloud SDK
-        uses: "google-github-actions/setup-gcloud@v2"
+      - name: Authenticate with Google Cloud
+        uses: "google-github-actions/auth@v2"
         with:
-          version: ">= 418.0.0"
-          install_components: "kubectl,gke-gcloud-auth-plugin"
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+          service_account: ${{ secrets.GCP_SERVICE_ACCOUNT_EMAIL }}
 
       - name: get timestamp to use in cache key
         id: get-timestamp