ci: merge various l1 boot tests into same l2 boot tests
Some of the test groups have both l1 and l2 boot test groups,
considering we no longer have many boot tests which are triggered with
CI+1, its no point keeping l1 boot tests group.
Merge l1 boot tests to corresponding l2 boot tests, following groups
have been modified so far
- tf-l1-boot-tests-cortex
- tf-l1-boot-tests-gicv2
- tf-l1-boot-tests-aarch32
- tf-l1-boot-tests-bl2_el3
- tf-l1-boot-tests-juno
- tf-l1-boot-tests-misc
Change-Id: I87b9219379598a53e7dc75d57e3cfcd9393adf3a
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
diff --git a/group/tf-l1-boot-tests-bl2_el3/fvp-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug b/group/tf-l1-boot-tests-bl2_el3/fvp-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l1-boot-tests-bl2_el3/fvp-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-boot-tests-gicv2/fvp-tspd-gicv2-symmetric-model:fvp-linux-dtb.gicv2-fip.uboot-aemv8a_revb.gicv2-tspd-debug b/group/tf-l1-boot-tests-gicv2/fvp-tspd-gicv2-symmetric-model:fvp-linux-dtb.gicv2-fip.uboot-aemv8a_revb.gicv2-tspd-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l1-boot-tests-gicv2/fvp-tspd-gicv2-symmetric-model:fvp-linux-dtb.gicv2-fip.uboot-aemv8a_revb.gicv2-tspd-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l1-boot-tests-aarch32/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-cortexa32x4-debug b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-cortexa32x4-debug
similarity index 100%
rename from group/tf-l1-boot-tests-aarch32/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-cortexa32x4-debug
rename to group/tf-l2-boot-tests-aarch32/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-cortexa32x4-debug
diff --git a/group/tf-l1-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32-fip.uboot32-cortexa32x4-debug b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32-fip.uboot32-cortexa32x4-debug
similarity index 100%
rename from group/tf-l1-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32-fip.uboot32-cortexa32x4-debug
rename to group/tf-l2-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32-fip.uboot32-cortexa32x4-debug
diff --git a/group/tf-l1-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32.1t-fip.uboot32-aemv8a.rstspmin-debug b/group/tf-l2-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32.1t-fip.uboot32-aemv8a.rstspmin-debug
similarity index 100%
rename from group/tf-l1-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32.1t-fip.uboot32-aemv8a.rstspmin-debug
rename to group/tf-l2-boot-tests-aarch32/fvp-aarch32-rst-to-sp-min:fvp-linux32.rstspmin-dtb.aarch32.1t-fip.uboot32-aemv8a.rstspmin-debug
diff --git a/group/tf-l1-boot-tests-cortex/fvp-no-cohmem:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4 b/group/tf-l2-boot-tests-cortex/fvp-no-cohmem:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4
similarity index 100%
rename from group/tf-l1-boot-tests-cortex/fvp-no-cohmem:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4
rename to group/tf-l2-boot-tests-cortex/fvp-no-cohmem:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4
diff --git a/group/tf-l1-boot-tests-cortex/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug b/group/tf-l2-boot-tests-cortex/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
similarity index 100%
rename from group/tf-l1-boot-tests-cortex/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
rename to group/tf-l2-boot-tests-cortex/fvp-tspd-tbb-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
diff --git a/group/tf-l1-boot-tests-cortex/fvp-tspd:fvp-linux-dtb-fip.uboot-cortexa35x4-tspd b/group/tf-l2-boot-tests-cortex/fvp-tspd:fvp-linux-dtb-fip.uboot-cortexa35x4-tspd
similarity index 100%
rename from group/tf-l1-boot-tests-cortex/fvp-tspd:fvp-linux-dtb-fip.uboot-cortexa35x4-tspd
rename to group/tf-l2-boot-tests-cortex/fvp-tspd:fvp-linux-dtb-fip.uboot-cortexa35x4-tspd
diff --git a/group/tf-l1-boot-tests-juno/juno-default:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-default:juno-linux.uboot
similarity index 100%
rename from group/tf-l1-boot-tests-juno/juno-default:juno-linux.uboot
rename to group/tf-l2-boot-tests-juno/juno-default:juno-linux.uboot
diff --git a/group/tf-l1-boot-tests-juno/juno-tspd:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-tspd:juno-linux.uboot
similarity index 100%
rename from group/tf-l1-boot-tests-juno/juno-tspd:juno-linux.uboot
rename to group/tf-l2-boot-tests-juno/juno-tspd:juno-linux.uboot
diff --git a/group/tf-l1-boot-tests-misc/fvp-boot-el3-payload,fvp-default:fvp-fip.tftf-el3payload-aemv8a.el3payload-debug b/group/tf-l2-boot-tests-misc/fvp-boot-el3-payload,fvp-default:fvp-fip.tftf-el3payload-aemv8a.el3payload-debug
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-boot-el3-payload,fvp-default:fvp-fip.tftf-el3payload-aemv8a.el3payload-debug
rename to group/tf-l2-boot-tests-misc/fvp-boot-el3-payload,fvp-default:fvp-fip.tftf-el3payload-aemv8a.el3payload-debug
diff --git a/group/tf-l1-boot-tests-misc/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
rename to group/tf-l2-boot-tests-misc/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
diff --git a/group/tf-l1-boot-tests-misc/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a.runtime_instr-debug b/group/tf-l2-boot-tests-misc/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a.runtime_instr-debug
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a.runtime_instr-debug
rename to group/tf-l2-boot-tests-misc/fvp-enable-runtime-instr,fvp-default:fvp-tftf-fip.tftf-aemv8a.runtime_instr-debug
diff --git a/group/tf-l1-boot-tests-misc/fvp-linux-as-bl33:fvp-linux.bl33-dtb-aemv8a.linux.bl33-debug b/group/tf-l2-boot-tests-misc/fvp-linux-as-bl33:fvp-linux.bl33-dtb-aemv8a.linux.bl33-debug
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-linux-as-bl33:fvp-linux.bl33-dtb-aemv8a.linux.bl33-debug
rename to group/tf-l2-boot-tests-misc/fvp-linux-as-bl33:fvp-linux.bl33-dtb-aemv8a.linux.bl33-debug
diff --git a/group/tf-l1-boot-tests-misc/fvp-mb_hash256-tbb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a b/group/tf-l2-boot-tests-misc/fvp-mb_hash256-tbb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-mb_hash256-tbb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a
rename to group/tf-l2-boot-tests-misc/fvp-mb_hash256-tbb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a
diff --git a/group/tf-l1-boot-tests-misc/fvp-mb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm_384-romlib-fip.ftpm-aemv8a b/group/tf-l2-boot-tests-misc/fvp-mb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm_384-romlib-fip.ftpm-aemv8a
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-mb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm_384-romlib-fip.ftpm-aemv8a
rename to group/tf-l2-boot-tests-misc/fvp-mb_hash384-optee-romlib:fvp-optee.mb-linux.rootfs+ftpm_384-romlib-fip.ftpm-aemv8a
diff --git a/group/tf-l1-boot-tests-misc/fvp-psa-mbedtls-mb_hash384-optee:fvp-optee.mb-linux.rootfs+ftpm_384-fip.ftpm-aemv8a b/group/tf-l2-boot-tests-misc/fvp-psa-mbedtls-mb_hash384-optee:fvp-optee.mb-linux.rootfs+ftpm_384-fip.ftpm-aemv8a
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-psa-mbedtls-mb_hash384-optee:fvp-optee.mb-linux.rootfs+ftpm_384-fip.ftpm-aemv8a
rename to group/tf-l2-boot-tests-misc/fvp-psa-mbedtls-mb_hash384-optee:fvp-optee.mb-linux.rootfs+ftpm_384-fip.ftpm-aemv8a
diff --git a/group/tf-l1-boot-tests-misc/fvp-reclaim-init-code,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-reclaim-init-code,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-reclaim-init-code,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
rename to group/tf-l2-boot-tests-misc/fvp-reclaim-init-code,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
diff --git a/group/tf-l1-boot-tests-misc/fvp-rst-bl31:fvp-linux.rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug b/group/tf-l2-boot-tests-misc/fvp-rst-bl31:fvp-linux.rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-rst-bl31:fvp-linux.rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug
rename to group/tf-l2-boot-tests-misc/fvp-rst-bl31:fvp-linux.rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug
diff --git a/group/tf-l1-boot-tests-misc/fvp-tspd-tsp-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-tspd b/group/tf-l2-boot-tests-misc/fvp-tspd-tsp-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-tspd
similarity index 100%
rename from group/tf-l1-boot-tests-misc/fvp-tspd-tsp-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-tspd
rename to group/tf-l2-boot-tests-misc/fvp-tspd-tsp-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-tspd