use runs-on for replay-verify workflows

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

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/module-verify.yaml b/.github/workflows/module-verify.yaml
@@ -39,7 +39,7 @@ jobs:
  SUB_DIR: e1
  BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/s3-public.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: 20
 
  verify-modules-mainnet:
@@ -52,7 +52,7 @@ jobs:
  SUB_DIR: e1
  BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/s3-public.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: 20
 
  test-verify-modules:
@@ -65,5 +65,5 @@ jobs:
  SUB_DIR: e1
  BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/s3-public.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: 20
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-module-verify.yaml b/.github/workflows/workflow-run-module-verify.yaml
@@ -25,7 +25,7 @@ on:
  description: "The runner to use for the job."
  type: string
  required: true
- default: "high-perf-docker-with-local-ssd"
+ default: "runs-on,cpu=96,family=c5d+c5ad,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=false"
  TIMEOUT_MINUTES:
  description: "Github job timeout in minutes"
  type: number
@@ -42,10 +42,6 @@ jobs:
  with:
  ref: ${{ inputs.GIT_SHA }}
 
- - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
- with:
- GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
-
  - name: Install AWS CLI
  shell: bash
  run: |

diff --git a/.github/workflows/workflow-run-replay-verify.yaml b/.github/workflows/workflow-run-replay-verify.yaml
@@ -38,7 +38,7 @@ on:
  description: "The runner to use for the job."
  type: string
  required: true
- default: "high-perf-docker-with-local-ssd"
+ default: "runs-on,cpu=96,family=c5d+c5ad,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=false"
  TIMEOUT_MINUTES:
  description: "Github job timeout in minutes"
  type: number
@@ -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
@@ -208,11 +208,11 @@ jobs:
  key: backup-config-${{ inputs.BUCKET }}/${{ inputs.SUB_DIR }}-${{ github.run_id }}
  fail-on-cache-miss: true
 
- - 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: Run replay-verify in parallel
  env: