raspios: major refactoring for image fetching, TODO: customization

2 files changed, 43 insertions, 24 deletions

diff --git a/roles/raspios/image/tasks/fetch.yml b/roles/raspios/image/tasks/fetch.yml
index c95f1dea..5060bdfe 100644
--- a/roles/raspios/image/tasks/fetch.yml
+++ b/roles/raspios/image/tasks/fetch.yml
@@ -4,33 +4,41 @@
     dest: "{{ raspios_download_dir }}"
     state: directory
 
+- name: fetch imageutility os list from download server
+  check_mode: no
+  uri:
+    url: "{{ raspios_download_url }}/os_list_imagingutility_v3.json"
+    body_format: json
+  register: raspios_os_list_imagingutility
+
+- set_fact:
+    raspios_download_url_image: "{{ raspios_os_list_imagingutility.json.os_list | raspios_extract_latest_image_download_url(raspios_download_base_url) }}"
+
 - name: download the raspios image
   block:
-  - name: download sha256sum
-    get_url:
-      url: "{{ raspios_download_base_url }}/{{ raspios_download_image_base_name }}.zip.sha256"
-      dest: "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.zip.sha256"
-
-  - name: download signature
+  - name: download sha256sum and signature
+    loop:
+    - sha256
+    - sig
     get_url:
-      url: "{{ raspios_download_base_url }}/{{ raspios_download_image_base_name }}.zip.sig"
-      dest: "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.zip.sig"
+      url: "{{ raspios_download_url_image }}.{{ item }}"
+      dest: "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.{{ item }}"
 
   - name: extract SHA256 hash of the image archive
-    command: grep '{{ raspios_download_image_base_name }}.zip' "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.zip.sha256"
+    command: grep '{{ raspios_download_image_base_name }}' "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.sha256"
     changed_when: False
     register: sha256
 
   - name: download image
     get_url:
-      url: "{{ raspios_download_base_url }}/{{ raspios_download_image_base_name }}.zip"
-      dest: "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.zip"
+      url: "{{ raspios_download_url_image }}"
+      dest: "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}"
       checksum: sha256:{{ sha256.stdout.split(' ') | first }}
 
   - name: check OpenPGP signature
     command: >-
       gpgv --keyring "{{ global_files_dir }}/common/keyrings/raspios.gpg"
-          "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.zip.sig" "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.zip"
+          "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.sig" "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}"
     changed_when: False
     register: raspios_image_gpg_result
 
@@ -40,9 +48,9 @@
   rescue:
   - name: delete downloaded artifacts
     loop:
-      - "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.zip.sha256"
-      - "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.zip.sig"
-      - "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.zip"
+      - "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}-sha256"
+      - "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.sig"
+      - "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}"
     file:
       path: "{{ item }}"
       state: absent
diff --git a/roles/raspios/image/tasks/main.yml b/roles/raspios/image/tasks/main.yml
index 86373da6..24c7c821 100644
--- a/roles/raspios/image/tasks/main.yml
+++ b/roles/raspios/image/tasks/main.yml
@@ -1,4 +1,14 @@
 ---
+- name: fetch os list from download server
+  check_mode: no
+  uri:
+    url: "{{ raspios_download_url }}/os_list_v3.json"
+    body_format: json
+  register: raspios_os_list
+
+- set_fact:
+    raspios_download_base_url: "{{ raspios_os_list.json.os_list | raspios_extract_download_base_url(raspios_variant, raspios_codename, raspios_arch) }}"
+
 - name: fetch base image
   run_once: true
   import_tasks: fetch.yml
@@ -16,15 +26,16 @@
     register: tmpdir
 
   - name: extract image
-    environment: ### TODO: remove once this lands in ansible: https://github.com/ansible/ansible/pull/76542
-      LANGUAGE: en_US.utf8
-    unarchive:
-      src: "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}.zip"
-      remote_src: yes
+    decompress:
+      src: "{{ raspios_download_dir }}/{{ raspios_download_image_base_name }}"
       dest: "{{ tmpdir.path }}"
+    register: raspios_image_extract_result
+
+  - set_fact:
+      raspios_output_image_base_name: "{{ raspios_image_extract_result.files | first | basename }}"
 
   - name: read partition layout from image
-    command: "sfdisk -q -r -J '{{ tmpdir.path }}/{{ raspios_download_image_base_name }}.img'"
+    command: "sfdisk -q -r -J '{{ tmpdir.path }}/{{ raspios_output_image_base_name }}'"
     register: sfdisk_result
 
   - debug:
@@ -38,13 +49,13 @@
 
   - name: copy newly built raspios image
     copy:
-      src: "{{ tmpdir.path }}/{{ raspios_download_image_base_name }}.img"
-      dest: "{{ raspios_output_dir }}/{{ raspios_output_image_base_name }}.img"
+      src: "{{ tmpdir.path }}/{{ raspios_output_image_base_name }}"
+      dest: "{{ raspios_output_dir }}/{{ raspios_output_image_base_name }}"
 
   - name: set output image names
     set_fact:
       output_images:
-      - "{{ raspios_output_dir }}/{{ raspios_output_image_base_name }}.img"
+      - "{{ (raspios_output_dir, raspios_output_image_base_name) | path_join | realpath }}"
 
   always:
   - name: save stdout build-log to output directory