saltstack · ScriptAutomate · Feb 9, 2024 · Feb 9, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,11 +71,6 @@ jobs:
                 - *state_tree_added_modified
                 - *os_images_scripts
                 - os-images/AWS/centos/*.hcl
-            os-images-centosstream:
-              - added|modified:
-                - *state_tree_added_modified
-                - *os_images_scripts
-                - os-images/AWS/centosstream/*.hcl
             os-images-debian:
               - added|modified:
                 - *state_tree_added_modified
@@ -240,18 +235,6 @@ jobs:
       changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
       runner-version: ${{ needs.collect-jobs.outputs.runner-version }}
 
-  centosstream:
-    name: CentOS Stream
-    needs:
-      - collect-jobs
-      - get-changed-files
-    if: ${{ fromJSON(needs.collect-jobs.outputs.jobs)['os-images-centosstream'] }}
-    uses: ./.github/workflows/build-image-action.yml
-    with:
-      distro-name: centosstream
-      changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
-      runner-version: ${{ needs.collect-jobs.outputs.runner-version }}
-
   debian:
     name: Debian
     needs:
@@ -336,7 +319,6 @@ jobs:
       - amazonlinux2000
       - archlinux
       - centos
-      - centosstream
       - debian
       - fedora
       - opensuse

diff --git a/os-images/AWS/centosstream/centosstream-8-arm64.pkrvars.hcl b/os-images/AWS/centosstream/centosstream-8-arm64.pkrvars.hcl
diff --git a/os-images/AWS/centosstream/centosstream-8-x86_64.pkrvars.hcl b/os-images/AWS/centosstream/centosstream-8-x86_64.pkrvars.hcl
diff --git a/os-images/AWS/centosstream/centosstream-9-arm64.pkrvars.hcl b/os-images/AWS/centosstream/centosstream-9-arm64.pkrvars.hcl
diff --git a/os-images/AWS/centosstream/centosstream-9-x86_64.pkrvars.hcl b/os-images/AWS/centosstream/centosstream-9-x86_64.pkrvars.hcl
diff --git a/os-images/AWS/centosstream/centosstream.pkr.hcl b/os-images/AWS/centosstream/centosstream.pkr.hcl
diff --git a/os-images/AWS/fedora/fedora-37-arm64.pkrvars.hcl b/os-images/AWS/fedora/fedora-37-arm64.pkrvars.hcl
diff --git a/os-images/AWS/fedora/fedora-37-x86_64.pkrvars.hcl b/os-images/AWS/fedora/fedora-37-x86_64.pkrvars.hcl
diff --git a/os-images/AWS/fedora/fedora-38-arm64.pkrvars.hcl b/os-images/AWS/fedora/fedora-38-arm64.pkrvars.hcl
diff --git a/os-images/AWS/fedora/fedora-38-x86_64.pkrvars.hcl b/os-images/AWS/fedora/fedora-38-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
@@ -0,0 +1,2 @@
+ami_filter    = "Fedora-Cloud-Base-39-*.aarch64-hvm-*-gp3-0"
+instance_type = "m6g.large"
diff --git a/os-images/AWS/fedora/fedora-39-x86_64.pkrvars.hcl b/os-images/AWS/fedora/fedora-39-x86_64.pkrvars.hcl
@@ -0,0 +1,2 @@
+ami_filter    = "Fedora-Cloud-Base-39-*.x86_64-hvm-*-gp3-0"
+instance_type = "t3a.large"
diff --git a/os-images/AWS/freebsd/freebsd-131-amd64-us-west-2.json b/os-images/AWS/freebsd/freebsd-131-amd64-us-west-2.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ami_filter = "Fedora-Cloud-Base-39-.aarch64-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-39-.x86_64-hvm--gp3-0"
		instance_type = "t3a.large"