Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use runs-on for replay-verify workflows #14846

Closed
wants to merge 1 commit into from
Closed

use runs-on for replay-verify workflows #14846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/module-verify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ jobs:
BUCKET: aptos-testnet-backup-2223d95b
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:
Expand All @@ -51,8 +50,7 @@ jobs:
BUCKET: aptos-mainnet-backup-backup-831a69a8
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:
Expand All @@ -64,6 +62,5 @@ jobs:
BUCKET: aptos-testnet-backup-2223d95b
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
12 changes: 6 additions & 6 deletions .github/workflows/replay-verify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -70,8 +73,7 @@ jobs:
# 1195000000-122000000: https://github.com/aptos-labs/aptos-core/pull/13832
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

Expand All @@ -94,8 +96,7 @@ jobs:
# 1197378568-1198492648: https://github.com/aptos-labs/aptos-core/pull/13832
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

Expand All @@ -115,7 +116,6 @@ jobs:
# 1195000000-1220000000: https://github.com/aptos-labs/aptos-core/pull/13832
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
7 changes: 1 addition & 6 deletions .github/workflows/workflow-run-module-verify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@ on:
description: "The path to the backup config template to use."
type: string
required: true
# GHA job config
RUNS_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,spot=false
TIMEOUT_MINUTES:
description: "Github job timeout in minutes"
type: number
Expand All @@ -42,10 +41,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: |
Expand Down
25 changes: 9 additions & 16 deletions .github/workflows/workflow-run-replay-verify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@ on:
description: "The path to the backup config template to use."
type: string
required: true
# GHA job config
RUNS_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,spot=false
TIMEOUT_MINUTES:
description: "Github job timeout in minutes"
type: number
Expand Down Expand Up @@ -81,12 +80,6 @@ on:
description: "The path to the backup config template to use."
type: string
required: true
# GHA job config
RUNS_ON:
description: "The runner to use for the job."
type: string
required: true
default: "high-perf-docker-with-local-ssd"
MAX_VERSIONS_PER_RANGE:
description: "The maximum number of versions to process in a single job."
type: number
Expand Down Expand Up @@ -126,11 +119,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
Expand Down Expand Up @@ -208,11 +201,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:
Expand Down
Loading