fvp|juno_utils.sh: several changes on yaml generation
This is a collection of changes required in order to produce correct
yaml files which ultimatelly are consumed by LAVA on behalf of
Open CI jobs [1]. Changes are done on top of [2], with the aim of
keeping [2] intact (the revert) and clearly identifying those required
changes while implementing & testing [1].
[1] https://review.trustedfirmware.org/c/ci/tf-a-job-configs/+/6217
[2] https://review.trustedfirmware.org/c/ci/tf-a-ci-scripts/+/6223
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: I8506416ef66ba283b336c82208ffc07bf0b2dc3b
diff --git a/juno_utils.sh b/juno_utils.sh
index 890f026..9fa1b0d 100644
--- a/juno_utils.sh
+++ b/juno_utils.sh
@@ -18,8 +18,8 @@
juno32_recovery_root="$linaro_release/juno32-latest-busybox-uboot"
juno32_recovery_root_oe="$linaro_release/juno32-latest-oe-uboot"
-juno_rootfs_url="$linaro_release/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz"
-juno32_rootfs_url="$linaro_release/linaro-image-alip-genericarmv7a-20150710-336.rootfs.tar.gz"
+juno_rootfs_url="${juno_rootfs_url:-$linaro_release/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz}"
+juno32_rootfs_url="${juno32_rootfs_url:-$linaro_release/linaro-image-alip-genericarmv7a-20150710-336.rootfs.tar.gz}"
get_optee_bin() {
local tmpdir="$(mktempdir)"
@@ -85,13 +85,16 @@
}
gen_juno_yaml() {
- local yaml_file="$workspace/juno.yaml"
+ local yaml_file="$workspace/juno.yaml"
+ local job_file="$workspace/job.yaml"
local payload_type="${payload_type:?}"
bin_mode="$mode" \
"$ci_root/script/gen_juno_${payload_type}_yaml.sh" > "$yaml_file"
+ cp "$yaml_file" "$job_file"
archive_file "$yaml_file"
+ archive_file "$job_file"
}
juno_aarch32_runtime() {