fix(codebuild): add build image AMAZON_LINUX_2_ARM_2 by polothy · Pull Request #16931 · aws/aws-cdk

polothy · 2021-10-12T21:17:50Z

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

gitpod-io · 2021-10-12T21:17:52Z

polothy · 2021-10-12T21:23:26Z

I couldn't get very far with this PR because I couldn't get buildup to work:

❯ ../../../scripts/buildup --resume
************************************************************
 buildup usage:
 - execute 'buildup --resume' to resume after failure
 - execute 'buildup' to restart the build from the start

test/test.build.d.ts(1,22): error TS2307: Cannot find module 'nodeunit' or its corresponding type declarations.
test/test.scrutiny.d.ts(1,22): error TS2307: Cannot find module 'nodeunit' or its corresponding type declarations.
Error: /Path/to/aws-cdk/node_modules/typescript/bin/tsc --build exited with error code 1
Build failed.!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
error Command failed with exit code 1.
info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
error: last command failed. fix problem and resume by executing: /Path/to/aws-cdk/scripts/foreach.sh
directory:    /Path/to/aws-cdk/packages/@aws-cdk/cfnspec

So, didn't look at tests (though I'm not seeing anything for these constants) and I was sort of hoping to implement something like LinuxBuildImage.fromCodeBuildImageId but for ARM containers. I'm not sure the best way to do this though, so advice would be welcomed.

Lastly - if it is easier if I just move over and someone else takes over, that is totally OK! Just trying to help out.

polothy · 2021-10-12T21:26:44Z

I was sort of hoping to implement something like LinuxBuildImage.fromCodeBuildImageId but for ARM containers. I'm not sure the best way to do this though, so advice would be welcomed.

This can also be in a separate PR so we don't block this. It would be nice to make this available to our developers who are taking advantage of the new ARM support in Lambda and want to build their code using ARM in their pipelines.

skinny85

Thanks for the contribution @polothy! A simple change is needed to make it pass.

skinny85 · 2021-10-12T22:11:47Z

packages/@aws-cdk/aws-codebuild/lib/project.ts

  public static readonly AMAZON_LINUX_2_3 = LinuxBuildImage.codeBuildImage('aws/codebuild/amazonlinux2-x86_64-standard:3.0');

  public static readonly AMAZON_LINUX_2_ARM: IBuildImage = new ArmBuildImage('aws/codebuild/amazonlinux2-aarch64-standard:1.0');
+  public static readonly AMAZON_LINUX_2_ARM_1: IBuildImage = new ArmBuildImage('aws/codebuild/amazonlinux2-aarch64-standard:1.0');


Let's get rid of this one, and just keep AMAZON_LINUX_2_ARM.

skinny85 · 2021-10-12T22:12:27Z

packages/@aws-cdk/aws-codebuild/lib/project.ts


  public static readonly AMAZON_LINUX_2_ARM: IBuildImage = new ArmBuildImage('aws/codebuild/amazonlinux2-aarch64-standard:1.0');
+  public static readonly AMAZON_LINUX_2_ARM_1: IBuildImage = new ArmBuildImage('aws/codebuild/amazonlinux2-aarch64-standard:1.0');
+  public static readonly AMAZON_LINUX_2_ARM_2: IBuildImage = new ArmBuildImage('aws/codebuild/amazonlinux2-aarch64-standard:2.0');


You need a comment for this element:

Suggested change

public static readonly AMAZON_LINUX_2_ARM_2: IBuildImage = new ArmBuildImage('aws/codebuild/amazonlinux2-aarch64-standard:2.0');

/** Image "aws/codebuild/amazonlinux2-aarch64-standard:2.0". */

public static readonly AMAZON_LINUX_2_ARM_2: IBuildImage = new ArmBuildImage('aws/codebuild/amazonlinux2-aarch64-standard:2.0');

skinny85 · 2021-10-12T22:16:54Z

I couldn't get very far with this PR because I couldn't get buildup to work:
❯ ../../../scripts/buildup --resume
************************************************************
 buildup usage:
 - execute 'buildup --resume' to resume after failure
 - execute 'buildup' to restart the build from the start

test/test.build.d.ts(1,22): error TS2307: Cannot find module 'nodeunit' or its corresponding type declarations.
test/test.scrutiny.d.ts(1,22): error TS2307: Cannot find module 'nodeunit' or its corresponding type declarations.
Error: /Path/to/aws-cdk/node_modules/typescript/bin/tsc --build exited with error code 1
Build failed.!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
error Command failed with exit code 1.
info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
error: last command failed. fix problem and resume by executing: /Path/to/aws-cdk/scripts/foreach.sh
directory:    /Path/to/aws-cdk/packages/@aws-cdk/cfnspec
So, didn't look at tests (though I'm not seeing anything for these constants) and I was sort of hoping to implement something like LinuxBuildImage.fromCodeBuildImageId but for ARM containers. I'm not sure the best way to do this though, so advice would be welcomed.

Lastly - if it is easier if I just move over and someone else takes over, that is totally OK! Just trying to help out.

You probably have some old .js files laying around from our recent test migration away from NodeUnit. Make sure to clean the repo from untracked files (git clean -dfx), and build again.

polothy · 2021-10-12T22:33:23Z

Thanks, making the requested changes!

Pull request has been modified.

polothy · 2021-10-12T22:41:17Z

You probably have some old .js files laying around from our recent test migration away from NodeUnit. Make sure to clean the repo from untracked files (git clean -dfx), and build again.

Yuuuup, nailed it, thanks!

polothy · 2021-10-12T22:47:32Z

OK, got these to run and pass locally:

../../../scripts/buildup
yarn build && yarn test

skinny85

👍

aws-cdk-automation · 2021-10-12T23:29:50Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
Commit ID: 63dc4cc
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

mergify · 2021-10-12T23:30:16Z

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

Fixes aws#16930 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

polothy marked this pull request as draft October 12, 2021 21:18

polothy mentioned this pull request Oct 12, 2021

(codebuild): missing AMAZON_LINUX_2_ARM v2.0 #16930

Closed

skinny85 previously requested changes Oct 12, 2021

View reviewed changes

skinny85 added the pr-linter/exempt-test The PR linter will not require test changes label Oct 12, 2021

fix(codebuild): add build image AMAZON_LINUX_2_ARM_2

63dc4cc

polothy force-pushed the codebuild-image-arm-fix branch from dbd03d1 to 63dc4cc Compare October 12, 2021 22:39

polothy marked this pull request as ready for review October 12, 2021 22:40

skinny85 approved these changes Oct 12, 2021

View reviewed changes

mergify bot merged commit 370cb31 into aws:master Oct 12, 2021

polothy deleted the codebuild-image-arm-fix branch October 13, 2021 15:05

	public static readonly AMAZON_LINUX_2_ARM_2: IBuildImage = new ArmBuildImage('aws/codebuild/amazonlinux2-aarch64-standard:2.0');
	/** Image "aws/codebuild/amazonlinux2-aarch64-standard:2.0". */
	public static readonly AMAZON_LINUX_2_ARM_2: IBuildImage = new ArmBuildImage('aws/codebuild/amazonlinux2-aarch64-standard:2.0');

Conversation

polothy commented Oct 12, 2021

Uh oh!

gitpod-io bot commented Oct 12, 2021

Uh oh!

polothy commented Oct 12, 2021

Uh oh!

polothy commented Oct 12, 2021

Uh oh!

skinny85 left a comment

Choose a reason for hiding this comment

Uh oh!

skinny85 Oct 12, 2021

Choose a reason for hiding this comment

Uh oh!

skinny85 Oct 12, 2021

Choose a reason for hiding this comment

Uh oh!

skinny85 commented Oct 12, 2021

Uh oh!

polothy commented Oct 12, 2021

Uh oh!

polothy commented Oct 12, 2021

Uh oh!

polothy commented Oct 12, 2021

Uh oh!

skinny85 left a comment

Choose a reason for hiding this comment

Uh oh!

aws-cdk-automation commented Oct 12, 2021

AWS CodeBuild CI Report

Uh oh!

mergify bot commented Oct 12, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants