Update gcp 8 and 9 packer definitions

Author: javihernandez

almalinux-8-gcp.pkr.hcl

@@ -100,10 +100,10 @@ build {
     only = ["qemu.almalinux-8-gcp-aarch64"]
   }
 
-  # copy the repo metadata file into output
+  # copy SBOM metadata file into output
   post-processor "shell-local" {
     inline = [
-      "cp /tmp/repo-metadata-$PACKER_BUILD_NAME.txt output-$PACKER_BUILD_NAME/"
+      "cp /tmp/sbom-data-$PACKER_BUILD_NAME.json output-$PACKER_BUILD_NAME/"
     ]
   }
 

almalinux-9-gcp.pkr.hcl

@@ -100,10 +100,10 @@ build {
     only = ["qemu.almalinux-9-gcp-aarch64"]
   }
 
-  # copy the repo metadata file into output
+  # copy SBOM metadata file into output
   post-processor "shell-local" {
     inline = [
-      "cp /tmp/repo-metadata-$PACKER_BUILD_NAME.txt output-$PACKER_BUILD_NAME/"
+      "cp /tmp/sbom-data-$PACKER_BUILD_NAME.json output-$PACKER_BUILD_NAME/"
     ]
   }
 

ansible/roles/cleanup_vm/tasks/main.yml

@@ -1,15 +1,15 @@
 ---
-- name: Include sbom_data role for SBOM data collection
-  include_role:
-    name: sbom_data
-  when: collect_sbom_data | bool
-
 - name: Remove older versions kernel and other packages
   ansible.builtin.command: dnf -y remove --oldinstallonly
   register: removeoldoutput
   changed_when: removeoldoutput.rc == 0
   ignore_errors: yes
 
+- name: Include sbom_data role for SBOM data collection
+  include_role:
+    name: sbom_data
+  when: collect_sbom_data | bool
+
 - name: Include repo metadata dump role (for SBOMs)
   include_role:
     name: dump_repo_metadata

ansible/roles/sbom_data/tasks/main.yml

@@ -7,10 +7,12 @@
 - name: Collect SBOM data from the system
   ansible.builtin.shell: python3 /dev/shm/sbom_data_collector.py -o /dev/shm/sbom-data.json -v
   register: sbom_data_collector
+  failed_when: false
 
 - name: Write SBOM data to artifact file
   ansible.builtin.fetch:
     src: /dev/shm/sbom-data.json
-    dest: "/tmp/sbom-data-{{ packer_build_name }}.json"
+    dest: /tmp/sbom-data-{{ packer_build_name }}.json
     flat: true
   become: false
+  when: sbom_data_collector.changed