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.

Sign up for GitHub

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

Jump to bottom

Upgrade Amazon Linux 2 to Kernel 5.10, and change naming convention for Amazon Linux 2023 #1836

Merged
merged 1 commit into from
Oct 9, 2023
Merged

Upgrade Amazon Linux 2 to Kernel 5.10, and change naming convention for Amazon Linux 2023 #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ jobs:
- *state_tree_added_modified
- *os_images_scripts
- os-images/AWS/amazonlinux/*.hcl
os-images-amazonlinux2023:
os-images-amazonlinux2000:
- added|modified:
- *state_tree_added_modified
- *os_images_scripts
- os-images/AWS/amazonlinux2023/*.hcl
- os-images/AWS/amazonlinux2000/*.hcl
os-images-archlinux:
- added|modified:
- *state_tree_added_modified
Expand Down Expand Up @@ -204,15 +204,15 @@ jobs:
changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
runner-version: ${{ needs.collect-jobs.outputs.runner-version }}

amazonlinux2023:
name: AmazonLinux2023
amazonlinux2000:
name: AmazonLinux2000
needs:
- collect-jobs
- get-changed-files
if: ${{ fromJSON(needs.collect-jobs.outputs.jobs)['os-images-amazonlinux2023'] }}
if: ${{ fromJSON(needs.collect-jobs.outputs.jobs)['os-images-amazonlinux2000'] }}
uses: ./.github/workflows/build-image-action.yml
with:
distro-name: amazonlinux2023
distro-name: amazonlinux2000
changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
runner-version: ${{ needs.collect-jobs.outputs.runner-version }}

Expand Down Expand Up @@ -333,6 +333,7 @@ jobs:
- get-changed-files
- almalinux
- amazonlinux
- amazonlinux2000
- archlinux
- centos
- centosstream
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/amazonlinux/amazonlinux-2-arm64.pkrvars.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ami_filter = "amzn2-ami-hvm-2.*-arm64-gp2"
ami_filter = "amzn2-ami-kernel-5.10-hvm-2.*-arm64-gp2"
instance_type = "m6g.large"
2 changes: 1 addition & 1 deletion os-images/AWS/amazonlinux/amazonlinux-2-x86_64.pkrvars.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ami_filter = "amzn2-ami-hvm-2.*-x86_64-gp2"
ami_filter = "amzn2-ami-kernel-5.10-hvm-2.*-x86_64-gp2"
instance_type = "t3a.large"
2 changes: 2 additions & 0 deletions os-images/AWS/amazonlinux2000/amazonlinux2000-2023-arm64.pkrvars.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ami_filter = "al2023-ami-2023.*arm64"
instance_type = "m6g.large"
2 changes: 2 additions & 0 deletions os-images/AWS/amazonlinux2000/amazonlinux2000-2023-x86_64.pkrvars.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ami_filter = "al2023-ami-2023.*x86_64"
instance_type = "t3a.large"
0 ...S/amazonlinux2023/amazonlinux2023.pkr.hcl → ...S/amazonlinux2000/amazonlinux2000.pkr.hcl
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions os-images/AWS/amazonlinux2023/amazonlinux2023-2023.1-arm64.pkrvars.hcl
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions os-images/AWS/amazonlinux2023/amazonlinux2023-2023.1-x86_64.pkrvars.hcl
View file
Open in desktop

This file was deleted.