Add Fedora 40 and Ubuntu 24.04

saltstack · Apr 30, 2024 · ae28373 · ae28373
1 parent 3e54431
commit ae28373
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 19 deletions.
diff --git a/golden-state-tree/os/fedora/pkgs/init.sls b/golden-state-tree/os/fedora/pkgs/init.sls
@@ -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

diff --git a/golden-state-tree/os/ubuntu/pkgs/init.sls b/golden-state-tree/os/ubuntu/pkgs/init.sls
@@ -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

diff --git a/golden-state-tree/pkgs/zlib.sls b/golden-state-tree/pkgs/zlib.sls
@@ -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

diff --git a/os-images/AWS/debian/debian-10-arm64.pkrvars.hcl b/os-images/AWS/debian/debian-10-arm64.pkrvars.hcl
diff --git a/os-images/AWS/debian/debian-10-x86_64.pkrvars.hcl b/os-images/AWS/debian/debian-10-x86_64.pkrvars.hcl
diff --git a/os-images/AWS/fedora/fedora-39-arm64.pkrvars.hcl b/os-images/AWS/fedora/fedora-39-arm64.pkrvars.hcl
diff --git a/os-images/AWS/fedora/fedora-39-x86_64.pkrvars.hcl b/os-images/AWS/fedora/fedora-39-x86_64.pkrvars.hcl
diff --git a/os-images/AWS/fedora/fedora-40-arm64.pkrvars.hcl b/os-images/AWS/fedora/fedora-40-arm64.pkrvars.hcl
@@ -0,0 +1,2 @@
+ami_filter    = "Fedora-Cloud-Base-AmazonEC2.aarch64-40-*-hvm-*-gp3-0"
+instance_type = "m6g.large"
diff --git a/os-images/AWS/fedora/fedora-40-x86_64.pkrvars.hcl b/os-images/AWS/fedora/fedora-40-x86_64.pkrvars.hcl
@@ -0,0 +1,2 @@
+ami_filter    = "Fedora-Cloud-Base-AmazonEC2.x86_64-40-*-hvm-*-gp3-0"
+instance_type = "t3a.large"
diff --git a/os-images/AWS/ubuntu/ubuntu-23.04-arm64.pkrvars.hcl b/os-images/AWS/ubuntu/ubuntu-23.04-arm64.pkrvars.hcl
diff --git a/os-images/AWS/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl b/os-images/AWS/ubuntu/ubuntu-23.04-x86_64.pkrvars.hcl
diff --git a/os-images/AWS/ubuntu/ubuntu-24.04-arm64.pkrvars.hcl b/os-images/AWS/ubuntu/ubuntu-24.04-arm64.pkrvars.hcl
@@ -0,0 +1,3 @@
+ami_filter    = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-*"
+instance_type = "m6g.large"
+ami_owner     = "099720109477"
diff --git a/os-images/AWS/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl b/os-images/AWS/ubuntu/ubuntu-24.04-x86_64.pkrvars.hcl
@@ -0,0 +1,3 @@
+ami_filter    = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*"
+instance_type = "t3a.large"
+ami_owner     = "099720109477"
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"
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"