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.

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

Abstract some ec2 CI logic and add support for c7g #1220

Merged
merged 2 commits into from
Oct 9, 2023

Conversation

samuel40791765
Copy link
Contributor

Issues:

Resolves CryptoAlg-1121

Description of changes:

We're looking to strengthen our CI coverage. This extends the M1 Mac CI framework to encapsulate specific ec2 instances we want to test against. Things are slightly different than M1 however. M1 instances need to be allocated for at least 24 hours, while these instances can be spun up and terminated on the fly.

Call-outs:

This, again, borrows a lot of code from our original benchmarking framework. Scripts and SSM document were taken from:

Testing:

CI changes are tested and can be seen in a PR on my local fork:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@samuel40791765 samuel40791765 requested a review from a team as a code owner October 2, 2023 18:34
@samuel40791765
Copy link
Contributor Author

I changed the name of "aws-lc-ci-macos-arm" to "aws-lc-ci-ec2-test-framework". That build batch won't be kicked off until we apply this change :).

@dkostic dkostic requested a review from skmcgrail October 3, 2023 17:13
@samuel40791765 samuel40791765 removed the request for review from andrewhop October 3, 2023 18:48
billbo-yang
billbo-yang previously approved these changes Oct 3, 2023
@skmcgrail skmcgrail self-requested a review October 3, 2023 23:32
tests/ci/cdk/cdk/ssm/general_test_run_ssm_document.yaml Outdated Show resolved Hide resolved
@@ -50,8 +50,8 @@
AwsLcGitHubAnalyticsStack(app, "aws-lc-ci-analytics", analytics_build_spec_file, env=env)
# bm_framework_build_spec_file = "cdk/codebuild/bm_framework_omnibus.yaml"
# BmFrameworkStack(app, "aws-lc-ci-bm-framework", bm_framework_build_spec_file, env=env)
mac_arm_build_spec_file = "cdk/codebuild/github_ci_macos_m1_omnibus.yaml"
AwsLcMacArmCIStack(app, "aws-lc-ci-macos-arm", mac_arm_build_spec_file, env=env)
ec2_test_framework_build_spec_file = "cdk/codebuild/ec2_test_framework_omnibus.yaml"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember, but I think we will need to remember to manually terminate this stack. It looks like the resources created in it are all unique I believe? Don't believe CDK will handle this for us in this instance.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah good call. I had to delete the original stack in my local fork, so the same should be applicable here as well. Also might have to apply this change to the FIPS branches as well or they'll still be calling the old stack.

tests/ci/run_ec2_test_framework.sh Outdated Show resolved Hide resolved
@samuel40791765 samuel40791765 enabled auto-merge (squash) October 9, 2023 17:58
@samuel40791765 samuel40791765 merged commit 5b9fb4b into aws:main Oct 9, 2023
4 of 5 checks passed
billbo-yang pushed a commit to billbo-yang/aws-lc that referenced this pull request Oct 9, 2023
This extends the M1 Mac CI framework to encapsulate specific
ec2 instances we want to test against.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants