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

Add Fedora 40 and Ubuntu 24.04 #1847

Merged
merged 1 commit into from
May 1, 2024
Merged

Add Fedora 40 and Ubuntu 24.04 #1847

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
4 changes: 2 additions & 2 deletions golden-state-tree/os/fedora/pkgs/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ include:
- pkgs.swig
- pkgs.tar
- pkgs.zlib
{%- if os_major_release != 38 %}
{#- There's no vault packages for Fedora 38 yet as it's the unstable version of Fedora #}
{%- if os_major_release <= 39 %}
{#- Newer OS targets don't require vault for CI/CD, as community salt extensions cover this #}
- pkgs.vault
{%- endif %}
- pkgs.jq
Expand Down
3 changes: 2 additions & 1 deletion golden-state-tree/os/ubuntu/pkgs/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ include:
- pkgs.swig
- pkgs.tar
- pkgs.zlib
{%- if grains['osmajorrelease'] != 23 %}
{%- if grains['osmajorrelease'] <= 22 %}
{#- Newer OS targets don't require vault for CI/CD, as community salt extensions cover this #}
- pkgs.vault
{%- endif %}
- pkgs.jq
Expand Down
3 changes: 3 additions & 0 deletions golden-state-tree/pkgs/zlib.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ zlib:
{%- elif grains['os_family'] == "Suse" %}
- libz1
- zlib-devel
{%- elif grains['os'] == "Fedora" %}
- zlib-ng-compat
- zlib-ng-compat-devel
{%- else %}
- zlib
- zlib-devel
Expand Down
3 changes: 0 additions & 3 deletions os-images/AWS/debian/debian-10-arm64.pkrvars.hcl
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions os-images/AWS/debian/debian-10-x86_64.pkrvars.hcl
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions os-images/AWS/fedora/fedora-39-arm64.pkrvars.hcl
View file
Open in desktop

This file was deleted.

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

This file was deleted.

2 changes: 2 additions & 0 deletions os-images/AWS/fedora/fedora-40-arm64.pkrvars.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ami_filter = "Fedora-Cloud-Base-AmazonEC2.aarch64-40-*-hvm-*-gp3-0"
instance_type = "m6g.large"
2 changes: 2 additions & 0 deletions os-images/AWS/fedora/fedora-40-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 = "Fedora-Cloud-Base-AmazonEC2.x86_64-40-*-hvm-*-gp3-0"
instance_type = "t3a.large"
3 changes: 0 additions & 3 deletions os-images/AWS/ubuntu/ubuntu-23.04-arm64.pkrvars.hcl
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions os-images/AWS/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions os-images/AWS/ubuntu/ubuntu-24.04-arm64.pkrvars.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ami_filter = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-*"
instance_type = "m6g.large"
ami_owner = "099720109477"
3 changes: 3 additions & 0 deletions os-images/AWS/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ami_filter = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*"
instance_type = "t3a.large"
ami_owner = "099720109477"
Loading