diff options
| author | Roy Franz <roy.franz@linaro.org> | 2015-06-09 19:41:51 -0700 |
|---|---|---|
| committer | Roy Franz <roy.franz@linaro.org> | 2015-06-09 19:41:51 -0700 |
| commit | 3a12e73576277b6107e2c1c5819abf4d3429850c (patch) | |
| tree | 84de35f712e1dae3d043e7061a8fd1801e317401 /linaro-edk2-prep-matrix.yaml | |
| parent | d7ce031db8d6199833027003c33d79a43c0f60ac (diff) | |
Add INITRD_URL to grub install test
Not sure if the grub install needs this.
Also change handling of skipped tests - now echo a message and leave
file missing.
Change-Id: I8a72e6f0b061b7332cf09414e6fa0c94f8752ff9
Signed-off-by: Roy Franz <roy.franz@linaro.org>
Diffstat (limited to 'linaro-edk2-prep-matrix.yaml')
| -rw-r--r-- | linaro-edk2-prep-matrix.yaml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/linaro-edk2-prep-matrix.yaml b/linaro-edk2-prep-matrix.yaml index 4fb7fcc187..587a85309e 100644 --- a/linaro-edk2-prep-matrix.yaml +++ b/linaro-edk2-prep-matrix.yaml @@ -175,7 +175,7 @@ # Test only valid for qemu64 if [ "${MX_B}" != "qemu64" ]; then - touch post_build_lava_parameters_qemu_iscsi_in_kvm + echo "Missing post_build_lava_parameters_qemu_iscsi_in_kvm file is expected" exit 0 fi DEVICE_TYPE=kvm @@ -205,7 +205,7 @@ -e "s|\${GIT_URL}|${GIT_URL}|" \ -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \ -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \ - < configs/linaro-edk2-prep/lava-job-definitions/kvm/template-qemu-iscsi-in-kvm.json \ + < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-qemu-iscsi-in-kvm.json \ > custom_lava_job_definition_qemu_iscsi_in_kvm.json cat << EOF > post_build_lava_parameters_qemu_iscsi_in_kvm @@ -228,7 +228,7 @@ # Test only valid for fvp-base-armbds if [ "${MX_B}" != "fvp-base-armbds" ]; then - touch post_build_lava_parameters_grub_install + echo "Missing post_build_lava_parameters_grub_install file is expected" exit 0 fi DEVICE_TYPE=rtsm_fvp_base-aemv8a @@ -237,6 +237,7 @@ BL1_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/fvp-base-armbds/bl1.bin FIP_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/fvp-base-armbds/fip.bin + INITRD_URL=http://releases.linaro.org/14.12/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20141212-729.rootfs.cpio.gz rm -rf configs git clone --depth 1 http://git.linaro.org/ci/job/configs.git @@ -276,7 +277,7 @@ #!/bin/bash # Test only valid for fvp-base-armbds if [ "${MX_B}" != "fvp-base-armbds" ]; then - touch post_build_lava_parameters_startup_boot + echo "Missing post_build_lava_parameters_startup_boot file is expected" exit 0 fi DEVICE_TYPE=rtsm_fvp_base-aemv8a @@ -321,7 +322,7 @@ #!/bin/bash # Test only valid for fvp-base-armbds if [ "${MX_B}" != "fvp-base-armbds" ]; then - touch post_build_lava_parameters_menu_boot + echo "Missing post_build_lava_parameters_menu_boot file is expected" exit 0 fi DEVICE_TYPE=rtsm_fvp_base-aemv8a @@ -366,7 +367,7 @@ #!/bin/bash # Test only valid for fvp-base-armbds if [ "${MX_B}" != "fvp-base-armbds" ]; then - touch post_build_lava_parameters_menu_boot_with_initrd + echo "Missing post_build_lava_parameters_menu_boot_with_initrd file is expected" exit 0 fi DEVICE_TYPE=rtsm_fvp_base-aemv8a @@ -412,7 +413,7 @@ #!/bin/bash # Test only valid for qemu64 if [ "${MX_B}" != "qemu64" ]; then - touch post_build_lava_parameters_qemu_aarch64_uefi + echo "Missing post_build_lava_parameters_qemu_aarch64_uefi file is expected" exit 0 fi DEVICE_TYPE=qemu-aarch64 @@ -440,7 +441,7 @@ -e "s|\${GIT_URL}|${GIT_URL}|" \ -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \ -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \ - < configs/linaro-edk2-prep/lava-job-definitions/qemu-aarch64/template.json \ + < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template.json \ > custom_lava_job_definition_qemu_aarch64_uefi.json cat << EOF > post_build_lava_parameters_qemu_aarch64_uefi |