Add latest golden images, drop Fedora 36

saltstack · Aug 2, 2023 · aae2534 · aae2534
1 parent 8078518
commit aae2534
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 77 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -1581,12 +1581,6 @@ jobs:
           - distro: redhat
             version: "9"
             arch: aarch64
-          - distro: fedora
-            version: "36"
-            arch: x86_64
-          - distro: fedora
-            version: "36"
-            arch: aarch64
           - distro: fedora
             version: "37"
             arch: x86_64

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -1566,12 +1566,6 @@ jobs:
           - distro: redhat
             version: "9"
             arch: aarch64
-          - distro: fedora
-            version: "36"
-            arch: x86_64
-          - distro: fedora
-            version: "36"
-            arch: aarch64
           - distro: fedora
             version: "37"
             arch: x86_64

diff --git a/.github/workflows/templates/build-rpm-repo.yml.jinja b/.github/workflows/templates/build-rpm-repo.yml.jinja
@@ -12,8 +12,6 @@
                                             ("redhat", "8", "aarch64"),
                                             ("redhat", "9", "x86_64"),
                                             ("redhat", "9", "aarch64"),
-                                            ("fedora", "36", "x86_64"),
-                                            ("fedora", "36", "aarch64"),
                                             ("fedora", "37", "x86_64"),
                                             ("fedora", "37", "aarch64"),
                                             ("fedora", "38", "x86_64"),

diff --git a/cicd/amis.yml b/cicd/amis.yml
@@ -1 +1 @@
-centosstream-9-x86_64: ami-0bd92f4dca5d74017
+centosstream-9-x86_64: ami-01cff601e7661e3d0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		centosstream-9-x86_64: ami-0bd92f4dca5d74017
		centosstream-9-x86_64: ami-01cff601e7661e3d0