commit df9c92ff8ad5bb219d945fb01e9cc03c79be27d7
author Leonardo Sandoval <leonardo.sandoval@linaro.org> Fri Mar 12 11:31:09 2021 -0600
committer Leonardo Sandoval <leonardo.sandoval@linaro.org> Wed Mar 24 16:45:53 2021 -0600
tree 2af53325a0c78f76f0fb6b457ea0c64d9d9e423b
parent 4cdaf73fd985ab639004d810577b76e06544f711

fvp_utils: include several missing artefacts in FVP LAVA job

Currently, several artefacts are not taken into account when
generating the LAVA job definition, including
busybox, (secure)hafnium, mcp rom, and scp rom/ram files, thus include
these into the FVP LAVA job generation.

Also, some artefacts have either similar names but different
extension, i.e. initrd.img versus initrd.bin, or different names but
similar extension, i.e. mcp_rom.bin versus mpc-rom.bin, or
fvp-base-gicv3-psci.dtb versus manifest.dtb, so take all these
varietes into account when generating the final LAVA job.

Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: If519ec1a11a0218a16371ebb60caff8d0e7003e9

script/gen_fvp_linux_yaml.sh

diff --git a/script/gen_fvp_linux_yaml.sh b/script/gen_fvp_linux_yaml.sh
index 76a2032..5ff62c1 100755
--- a/script/gen_fvp_linux_yaml.sh
+++ b/script/gen_fvp_linux_yaml.sh
@@ -45,6 +45,15 @@
         url: {BL31}
       bl32:
         url: {BL32}
+      busybox:
+        url: {BUSYBOX}
+        compression: gz
+      cactus_primary:
+        url: {CACTUS_PRIMARY}
+      cactus_secondary:
+        url: {CACTUS_SECONDARY}
+      cactus_tertiary:
+        url: {CACTUS_TERTIARY}
       dtb:
         url: {DTB}
       el3_payload:
@@ -53,8 +62,16 @@
         url: {FIP}
       fwu_fip:
         url: {FWU_FIP}
+      generic_trace:
+        url: {GENERIC_TRACE}
+      hafnium:
+        url: {HAFNIUM}
       image:
         url: {IMAGE}
+      mcp_rom:
+        url: {MCP_ROM}
+      mcp_rom_hyphen:
+        url: {MCP_ROM_HYPHEN}
       ns_bl1u:
         url: {NS_BL1U}
       ns_bl2u:
@@ -66,6 +83,16 @@
       rootfs:
         url: {ROOTFS}
         compression: gz
+      secure_hafnium:
+        url: {SECURE_HAFNIUM}
+      scp_ram:
+        url: {SCP_RAM}
+      scp_ram_hyphen:
+        url: {SCP_RAM_HYPHEN}
+      scp_rom:
+        url: {SCP_ROM}
+      scp_rom_hyphen:
+        url: {SCP_ROM_HYPHEN}
       spm:
         url: {SPM}
       tftf:

script/gen_fvp_tftf_yaml.sh

diff --git a/script/gen_fvp_tftf_yaml.sh b/script/gen_fvp_tftf_yaml.sh
index b74c20f..e1c874e 100755
--- a/script/gen_fvp_tftf_yaml.sh
+++ b/script/gen_fvp_tftf_yaml.sh
@@ -48,6 +48,15 @@
         url: {BL31}
       bl32:
         url: {BL32}
+      busybox:
+        url: {BUSYBOX}
+        compression: gz
+      cactus_primary:
+        url: {CACTUS_PRIMARY}
+      cactus_secondary:
+        url: {CACTUS_SECONDARY}
+      cactus_tertiary:
+        url: {CACTUS_TERTIARY}
       dtb:
         url: {DTB}
       el3_payload:
@@ -56,8 +65,16 @@
         url: {FIP}
       fwu_fip:
         url: {FWU_FIP}
+      generic_trace:
+        url: {GENERIC_TRACE}
+      hafnium:
+        url: {HAFNIUM}
       image:
         url: {IMAGE}
+      mcp_rom:
+        url: {MCP_ROM}
+      mcp_rom_hyphen:
+        url: {MCP_ROM_HYPHEN}
       ns_bl1u:
         url: {NS_BL1U}
       ns_bl2u:
@@ -69,6 +86,16 @@
       rootfs:
         url: {ROOTFS}
         compression: gz
+      secure_hafnium:
+        url: {SECURE_HAFNIUM}
+      scp_ram:
+        url: {SCP_RAM}
+      scp_ram_hyphen:
+        url: {SCP_RAM_HYPHEN}
+      scp_rom:
+        url: {SCP_ROM}
+      scp_rom_hyphen:
+        url: {SCP_ROM_HYPHEN}
       spm:
         url: {SPM}
       tftf: