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

Merge feature/al2022 to main #43

Merged
merged 7 commits into from
Apr 6, 2022
Merged

Conversation

chienhanlin
Copy link
Contributor

@chienhanlin chienhanlin commented Apr 4, 2022

Summary

Merge feature/al2022 branch into main branch.

Implementation details

Commits in this PR includes:

  1. Initial commit of AL2022 recipes: 83dd4f5
  2. recipe fixups #28
  3. [AL2022] Refactor ECS optimized AL2022 AMI building scripts - Part 1 #36
  4. Disable Amazon Linux 2022 motd, add ECS motd #32
  5. [AL2022] Refactor ECS optimized AL2022 AMI building scripts - Part 2 #38
  6. add variables to support local init rpm and pgp key override #40
  7. [AL2022] Use ssm, remove aws-logs and add distribution_release_al2022 #41

Testing

  1. Built an ECS optimized AL2 and AL2022 AMIs
  2. Ran TestTaskCPULimits successfully on ECS optimized AL2 and AL2022 AMIs
  3. Partial outputs from REGION=us-west-2 make al2022
==> amazon-ebs.al2022: + sudo ln -s /dev/null /etc/motd.d/30-banner
==> amazon-ebs.al2022: + echo -e '
==> amazon-ebs.al2022:    __|  __|  __|
==> amazon-ebs.al2022:    _|  (   \__ \   Amazon Linux 2022 (ECS Optimized)
==> amazon-ebs.al2022:  ____|\___|____/   Preview
==> amazon-ebs.al2022:
==> amazon-ebs.al2022: For documentation, visit http://aws.amazon.com/documentation/ecs'
==> amazon-ebs.al2022: + sudo dnf update -y --releasever=2022.0.20220315
    amazon-ebs.al2022: Waiting for process with pid 1612 to finish.
    amazon-ebs.al2022: Last metadata expiration check: 0:00:17 ago on Mon 04 Apr 2022 04:43:00 PM UTC.
    amazon-ebs.al2022: Dependencies resolved.
    amazon-ebs.al2022: Nothing to do.
    amazon-ebs.al2022: Complete!

New tests cover the changes: no

Description for the changelog

ECS Optimized AL2022 AMI preview

Licensing

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

fierlion
fierlion previously approved these changes Apr 4, 2022
ami_type = "al2022arm"
ami_version = "2022.0.${var.ami_version}"
}
}
Copy link
Member

Choose a reason for hiding this comment

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

arm is WIP, correct? That's why we don't have everything from al2022.pkr.hcl?

Copy link
Contributor Author

@chienhanlin chienhanlin Apr 4, 2022

Choose a reason for hiding this comment

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

The build block for both AL2022 and AL2022 ARM are defined in al2022.pkr.hcl, on line 38, instead of redefined in al2022arm.pkr.hcl.

With al2022arm.pkr.hcl and builders defined in al2022.pkr.hcl, users can still run REGION=us-west-2 make al2022arm to build their Al2022 ARM AMIs.

Note: AL2022 ARM is not included in preview, due to amazonlinux/amazon-linux-2023#101.

yinyic
yinyic previously approved these changes Apr 6, 2022
sparrc and others added 7 commits April 6, 2022 17:23
Co-authored-by: Cameron Sparr <sparrc@users.noreply.github.com>
Co-authored-by: yinyic <71737798+yinyic@users.noreply.github.com>
…ws#36)

* Add most_recent = true to source_ami_filter for all al flavors

* Release 20220209 (aws#29)

* Rename variables for AL2, update al2022.pkr.hcl and install-workarounds.sh for AL2022

* Update OS name for AL2022 ARM and reorder source AMIs

Co-authored-by: Angel Velazquez <angelcar@amazon.com>
Co-authored-by: Yash Kulshrestha <YashdalfTheGray@users.noreply.github.com>
* add variables to support local init rpm and pgp key override
* fmt
* remove pgp key override, let install-additional-packages.sh handle local init install
* remove standalone key file
1. Use ssm for AL2022 x86_64
2. Remove aws-logs from workarounds
3. Add the AL2022 distribution release as one of the variables
@chienhanlin chienhanlin dismissed stale reviews from yinyic and fierlion via 7b00db2 April 6, 2022 17:26
@chienhanlin chienhanlin merged commit dc179eb into aws:main Apr 6, 2022
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.

5 participants