Update EC2 test framework AMI (aws#1395)

* Update EC2 AMI for Graviton 3 to latest Ubuntu 22.04 image, improve naming convention for hosts, and add logging.
dougch · Jan 30, 2024 · 61ab4de · 61ab4de
1 parent 24c34e3
commit 61ab4de
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/tests/ci/cdk/cdk/codebuild/ec2_test_framework_omnibus.yaml b/tests/ci/cdk/cdk/codebuild/ec2_test_framework_omnibus.yaml
@@ -12,9 +12,9 @@ batch:
       env:
         type: LINUX_CONTAINER
         privileged-mode: true
-        compute-type: BUILD_GENERAL1_LARGE
+        compute-type: BUILD_GENERAL1_SMALL
         image: 620771051181.dkr.ecr.us-west-2.amazonaws.com/aws-lc-docker-images-linux-x86:ubuntu-20.04_clang-7x-bm-framework_latest
         variables:
-          EC2_AMI: "ami-0c79a55dda52434da"
+          EC2_AMI: "ami-0a24e6e101933d294"
           EC2_INSTANCE_TYPE: "c7g.2xlarge"
           ECR_DOCKER_TAG: "amazonlinux-2023_clang-15x_sanitizer"
diff --git a/tests/ci/cdk/cdk/ssm/general_test_run_ssm_document.yaml b/tests/ci/cdk/cdk/ssm/general_test_run_ssm_document.yaml
@@ -41,3 +41,4 @@ mainSteps:
         - $exec_docker ./tests/ci/run_posix_sanitizers.sh
         - chmod +x ./tests/ci/run_fips_tests.sh
         - $exec_docker ./tests/ci/run_fips_tests.sh
+        - echo All ec2 test framework tests passed
diff --git a/tests/ci/run_ec2_test_framework.sh b/tests/ci/run_ec2_test_framework.sh
@@ -33,7 +33,7 @@ create_ec2_instances() {
   instance_id="$(aws ec2 run-instances --image-id "$1" --count 1 \
     --instance-type "$2" --security-group-ids "${sg_id}" --subnet-id "${subnet_id}" \
     --block-device-mappings 'DeviceName="/dev/sda1",Ebs={DeleteOnTermination=True,VolumeSize=200}' \
-    --tag-specifications 'ResourceType="instance",Tags=[{Key="aws-lc",Value="aws-lc-ci-ec2-test-framework-ec2-x86-instance"}]' \
+    --tag-specifications 'ResourceType="instance",Tags=[{Key="Name",Value="ec2-test-'"$CODEBUILD_WEBHOOK_TRIGGER"'"}]' \
     --iam-instance-profile Name=aws-lc-ci-ec2-test-framework-ec2-profile \
     --placement 'AvailabilityZone=us-west-2a' \
     --instance-initiated-shutdown-behavior terminate \