merge various l1 boot tests in same l2 boot tests

Following l1 groups has been removed 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

Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
Change-Id: I40931cf3e991d4643955cfbc944aca0593ca14de
diff --git a/tf-a-lts2.10-gerrit-tforg-l2.yaml b/tf-a-lts2.10-gerrit-tforg-l2.yaml
index 55ed65d..2fcac02 100644
--- a/tf-a-lts2.10-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.10-gerrit-tforg-l2.yaml
@@ -117,7 +117,7 @@
         - kill-phase-on: NEVER
           name: tf-a-lts2.10-ci-gateway
           predefined-parameters: |
-            TEST_GROUPS=tf-l1-boot-tests-aarch32 tf-l1-boot-tests-bl2_el3 tf-l1-boot-tests-cortex tf-l1-boot-tests-gicv2 tf-l1-boot-tests-misc tf-plat-tests tf-l1-boot-tests-plat
+            TEST_GROUPS=tf-plat-tests tf-l1-boot-tests-plat
             TF_REFSPEC=$GERRIT_REFSPEC
           property-file: env.param
     - multijob:
@@ -139,7 +139,7 @@
           name: tf-a-lts2.10-ci-gateway
           current-parameters: true
           predefined-parameters: |
-            TEST_GROUPS=tf-l1-boot-tests-juno tf-l2-boot-tests-aarch32 tf-l2-boot-tests-bl2_el3 tf-l2-boot-tests-cortex tf-l2-boot-tests-juno tf-l2-boot-tests-latest tf-l2-boot-tests-misc tf-l2-boot-tests-rootfs tf-l2-boot-tests-spm-mm spm-l2-boot-tests
+            TEST_GROUPS=tf-l2-boot-tests-aarch32 tf-l2-boot-tests-bl2_el3 tf-l2-boot-tests-cortex tf-l2-boot-tests-juno tf-l2-boot-tests-latest tf-l2-boot-tests-misc tf-l2-boot-tests-rootfs tf-l2-boot-tests-spm-mm spm-l2-boot-tests
             TF_REFSPEC=$GERRIT_REFSPEC
           property-file: env.param
     - conditional-step: