Skip to content

Commit

Permalink
chore(ci): hotfix AMI's, workflow to stop personal spot runners (#5712)
Browse files Browse the repository at this point in the history
  • Loading branch information
ludamad committed Apr 11, 2024
1 parent b16f169 commit 5f18139
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 5 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ jobs:
runner_label: ${{ github.actor }}-x86
ebs_cache_size_gb: 128
runner_concurrency: 50
subaction: ${{ github.event.inputs.runner_action || 'start' }}
ec2_instance_type: m6a.32xlarge
ec2_ami_id: ami-0d8a9b0419ddb331a
ec2_ami_id: ami-04d8422a9ba4de80f
ec2_instance_ttl: 40 # refreshed by jobs
secrets: inherit

Expand Down Expand Up @@ -70,7 +71,7 @@ jobs:
concurrency_key: e2e-${{ github.actor }}-x86-${{ matrix.test }}
- name: Test
working-directory: ./yarn-project/end-to-end/
timeout-minutes: 15
timeout-minutes: 25
run: earthly -P --no-output +${{ matrix.test }} --e2e_mode=cache
# TODO
# - name: Upload logs
Expand Down Expand Up @@ -111,7 +112,7 @@ jobs:
concurrency_key: bb-bench-binaries-${{ github.actor }}-x86
- name: Build and Push Binaries
if: ${{ github.event.inputs.just_start_spot != 'true' }}
timeout-minutes: 25
timeout-minutes: 15
working-directory: ./barretenberg/cpp/
run: earthly --push +bench-binaries

Expand All @@ -122,8 +123,9 @@ jobs:
runner_label: ${{ github.actor }}-bench-x86
ebs_cache_size_gb: 32
runner_concurrency: 1
subaction: ${{ github.event.inputs.runner_action || 'start' }}
ec2_instance_type: m6a.4xlarge
ec2_ami_id: ami-0d8a9b0419ddb331a
ec2_ami_id: ami-04d8422a9ba4de80f
ec2_instance_ttl: 15 # refreshed by jobs
secrets: inherit

Expand All @@ -148,7 +150,7 @@ jobs:
- name: Ultrahonk Bench
working-directory: ./barretenberg/cpp/
timeout-minutes: 15
run: earthly --no-output +bench-ulAtra-honk --bench_mode=cache
run: earthly --no-output +bench-ultra-honk --bench_mode=cache

# # Post actions, deploy and summarize logs
# aztec-bench-summary:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/setup-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ on:
ebs_cache_size_gb:
required: true
type: string
subaction:
required: true
type: string
secrets:
AWS_ACCESS_KEY_ID:
required: true
Expand All @@ -61,6 +64,7 @@ jobs:
ec2_security_group_id: ${{ inputs.ec2_security_group_id }}
ec2_spot_instance_strategy: ${{ inputs.ec2_spot_instance_strategy }}
runner_label: ${{ inputs.runner_label }}
subaction: ${{inputs.subaction }}
runner_concurrency: ${{ inputs.runner_concurrency }}
ec2_instance_type: ${{ inputs.ec2_instance_type }}
ec2_ami_id: ${{ inputs.ec2_ami_id }}
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/stop-spot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Useful if the spot runners are in a bad state
name: Stop Personal Spot
on:
workflow_dispatch: {}
jobs:
stop-build-arm:
uses: ./.github/workflows/setup-runner.yml
with:
runner_label: ${{ github.actor }}-arm
subaction: stop
# not used:
ebs_cache_size_gb: 128
runner_concurrency: 8
ec2_instance_type: r6g.16xlarge
ec2_ami_id: ami-0d8a9b0419ddb331a
ec2_instance_ttl: 40
secrets: inherit

stop-build-x86:
uses: ./.github/workflows/setup-runner.yml
with:
runner_label: ${{ github.actor }}-x86
subaction: stop
# not used:
ebs_cache_size_gb: 128
runner_concurrency: 50
ec2_instance_type: m6a.32xlarge
ec2_ami_id: ami-0d8a9b0419ddb331a
ec2_instance_ttl: 40
secrets: inherit

stop-bench:
uses: ./.github/workflows/setup-runner.yml
with:
runner_label: ${{ github.actor }}-bench-x86
subaction: stop
# not used:
ebs_cache_size_gb: 32
runner_concurrency: 1
ec2_instance_type: m6a.4xlarge
ec2_ami_id: ami-0d8a9b0419ddb331a
ec2_instance_ttl: 15
secrets: inherit

0 comments on commit 5f18139

Please sign in to comment.