Skip to content

Commit a88784e

Browse files
committed
CI: Do not use custom AMI for CBMC runners
Currently we are using custom AMIs for the CBMC tests. The only reason for using custom AMI is that require a disk of larger than the default 8 GB. This commit switches to default AMIs and instead uses the ec2_volume_size argument of the ec2-github-runner action. Signed-off-by: Matthias J. Kannwischer <[email protected]>
1 parent 45e64ca commit a88784e

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/workflows/cbmc.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
with:
1919
name: CBMC (ML-DSA-44)
2020
ec2_instance_type: c7g.4xlarge
21-
ec2_ami: ubuntu-latest (custom AMI)
22-
ec2_ami_id: ami-0d7f502261b31b27f # aarch64, ubuntu-latest, 64g
21+
ec2_ami: ubuntu-latest (aarch64)
22+
ec2_volume_size: 20
2323
compile_mode: native
2424
opt: no_opt
2525
lint: false
@@ -40,8 +40,8 @@ jobs:
4040
with:
4141
name: CBMC (ML-DSA-65)
4242
ec2_instance_type: c7g.4xlarge
43-
ec2_ami: ubuntu-latest (custom AMI)
44-
ec2_ami_id: ami-0d7f502261b31b27f # aarch64, ubuntu-latest, 64g
43+
ec2_ami: ubuntu-latest (aarch64)
44+
ec2_volume_size: 20
4545
compile_mode: native
4646
opt: no_opt
4747
lint: false
@@ -62,8 +62,8 @@ jobs:
6262
with:
6363
name: CBMC (ML-DSA-87)
6464
ec2_instance_type: c7g.4xlarge
65-
ec2_ami: ubuntu-latest (custom AMI)
66-
ec2_ami_id: ami-0d7f502261b31b27f # aarch64, ubuntu-latest, 64g
65+
ec2_ami: ubuntu-latest (aarch64)
66+
ec2_volume_size: 20
6767
compile_mode: native
6868
opt: no_opt
6969
lint: false

.github/workflows/ci_ec2_reusable.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ on:
2424
type: string
2525
description: AMI ID
2626
default: ami-0e8c824f386e1de06
27+
ec2_volume_size:
28+
type: string
29+
default: ""
2730
cflags:
2831
type: string
2932
description: Custom CFLAGS for compilation
@@ -113,6 +116,7 @@ jobs:
113116
mode: start
114117
github-token: ${{ secrets.AWS_GITHUB_TOKEN }}
115118
ec2-image-id: ${{ steps.det_ami_id.outputs.AMI_ID }}
119+
ec2-volume-size: ${{ inputs.ec2_volume_size }}
116120
ec2-instance-type: ${{ inputs.ec2_instance_type }}
117121
subnet-id: subnet-094d73eb42eb6bf5b
118122
security-group-id: sg-0282706dbc92a1579
@@ -130,6 +134,7 @@ jobs:
130134
mode: start
131135
github-token: ${{ secrets.AWS_GITHUB_TOKEN }}
132136
ec2-image-id: ${{ steps.det_ami_id.outputs.AMI_ID }}
137+
ec2-volume-size: ${{ inputs.ec2_volume_size }}
133138
ec2-instance-type: ${{ inputs.ec2_instance_type }}
134139
subnet-id: subnet-094d73eb42eb6bf5b
135140
security-group-id: sg-0282706dbc92a1579

0 commit comments

Comments
 (0)