juno: remove juno boot tests from CI+1

Considering the number of CI false positive failures caused by lava
its better to remove all Juno boot tests from CI+1 jobs and keep
it only in CI+2 or main.
Following changes are done:
 - Remove all Juno boot tests from CI+1
 - Keep all juno-l1 boot tests to Linux shell boot in CI+2
 - Create a new group in tf-main for all juno boot tests

Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
Change-Id: I3b02c1523f0ef96f3179030c91ba7860ccb1fc85
diff --git a/tf-a-main.yaml b/tf-a-main.yaml
index 7c8fbaa..ab42c1e 100644
--- a/tf-a-main.yaml
+++ b/tf-a-main.yaml
@@ -106,7 +106,7 @@
           predefined-parameters: TEST_GROUPS=tf-l1-build-clang
           property-file: tf-a-env.param
     - multijob:
-        name: TFTF Tests
+        name: TFTF Tests for FVP
         condition: COMPLETED
         projects:
         - name: tf-a-ci-gateway
@@ -117,7 +117,7 @@
         - name: tf-a-ci-gateway
           current-parameters: true
           kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l1-juno tftf-l2-fvp-auxiliary
+          predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l2-fvp-auxiliary
           property-file: tf-a-tests-env.param
         - name: tf-a-ci-gateway
           current-parameters: true
@@ -151,11 +151,6 @@
         - name: tf-a-ci-gateway
           current-parameters: true
           kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-juno
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          current-parameters: true
-          kill-phase-on: NEVER
           predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-spm-mm
           property-file: tf-a-env.param
         - name: tf-a-ci-gateway
@@ -193,6 +188,25 @@
           predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-bl2_el3
           property-file: tf-a-env.param
     - multijob:
+        name: Juno Boot Tests
+        condition: COMPLETED
+        projects:
+        - name: tf-a-ci-gateway
+          current-parameters: true
+          kill-phase-on: NEVER
+          predefined-parameters: TEST_GROUPS=tf-l1-boot-tests-juno
+          property-file: tf-a-env.param
+        - name: tf-a-ci-gateway
+          current-parameters: true
+          kill-phase-on: NEVER
+          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-juno
+          property-file: tf-a-env.param
+        - name: tf-a-ci-gateway
+          current-parameters: true
+          kill-phase-on: NEVER
+          predefined-parameters: TEST_GROUPS=tftf-l1-juno
+          property-file: tf-a-env.param
+    - multijob:
         name: Miscellaneous tests
         condition: COMPLETED
         projects: