Removed Fedora 38

- Also fixed AlmaLunux 8.10
alchemy-solutions · Jun 5, 2024 · f88909e · f88909e
1 parent 99d810d
commit f88909e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/ansible/group_vars/all.yaml b/ansible/group_vars/all.yaml
@@ -18,8 +18,8 @@ distros:
   pup_filter: "'a text{}'"
   awk_filter: "-F- '/GenericCloud-.*[0-9]{8}/{ split($5,ver,\".\"); print ver[1] }'"
   releases:
-  - name: 9
-    version: 9.4
+  - name: "9"
+    version: "9.4"
     description: AlmaLinux 9.4 (Seafoam Ocelot) Cloud Image
     checksum: !unsafe "sha256:{{ base_url }}/CHECKSUM"
     eos: May 2027
@@ -29,8 +29,8 @@ distros:
       type: x86_64
     - name: arm64
       type: aarch64
-  - name: 8
-    version: 8.10
+  - name: "8"
+    version: "8.10"
     description: AlmaLinux 8.10 (Cerulean Leopard) Cloud Image
     eos: May 2024
     eol: Mar 2029
@@ -110,16 +110,6 @@ distros:
       type: x86_64
     - name: arm64
       type: aarch64
-  - name: 38
-    version: 38
-    description: Fedora 38 Cloud Image
-    eol: November 2024
-    file_url: !unsafe "{{ base_url }}/Fedora-Cloud-Base-{{ release.name }}-{{ build }}.{{ arch.type }}.qcow2"
-    arch:
-    - name: amd64
-      type: x86_64
-    - name: arm64
-      type: aarch64
 
 # https://wiki.ubuntu.com/Releases
 # https://cloud-images.ubuntu.com

diff --git a/ansible/provider.yaml b/ansible/provider.yaml
@@ -51,12 +51,13 @@
     build_version: "{{ distro_build }}"
 
 - name: Check for providers
-  #include_tasks: box.yaml
+  when:
+  - create
+  - arch.name not in archs
   include_role:
     name: "{{ provider }}"
   vars:
     archs: "{{ box_info.json.versions|selectattr('number', 'eq', build_version)|map(attribute='providers')|first|default([])|selectattr('name', 'eq', provider)|map(attribute='architecture') }}"
   loop: "{{ providers }}"
   loop_control:
     loop_var: provider
-  when: arch.name not in archs
diff --git a/ansible/release.yaml b/ansible/release.yaml
@@ -11,6 +11,9 @@
   register: box_info
 
 - name: Update Vagrant Cloud box
+  when:
+  - update
+  - box_info.status == 200
   uri:
     url: "https://app.vagrantup.com/api/v2/box/{{ vagrant_cloud_user }}/{{ vagrant_box }}"
     method: PUT
@@ -24,11 +27,11 @@
       box:
         short_description: "{{ release.description }}"
         is_private: false
-  when:
-  - update
-  - box_info.status == 200
 
 - name: Create Vagrant Cloud box
+  when:
+  - create
+  - box_info.status == 404
   uri:
     url: https://app.vagrantup.com/api/v2/boxes
     method: POST
@@ -46,9 +49,6 @@
         short_description: "{{ release.description }}"
         is_private: false
   register: box_create
-  when:
-  - create
-  - box_info.status == 404
 
 - name: Set initial box version
   set_fact: