Fix nested trigger_jobs (A)

After upgrading to JJB 2.2.0 any nested parameters
up to 3 levels will be reported as a failure.
We need to fix those so that there is only 2
levels maximum.
Committing this as a single patch since our verify
job is broken.

Issue-ID: CIMAN-184
Change-Id: I9e0e245109af786345802caee2f6f26126f550d4
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

diff --git a/jjb/aaf/aaf-csit.yaml b/jjb/aaf/aaf-csit.yaml
index aec49b3..42aefcf 100644 (file)
--- a/jjb/aaf/aaf-csit.yaml
+++ b/jjb/aaf/aaf-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'aafapi':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
+          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/aaf/aaf-sms-csit.yaml b/jjb/aaf/aaf-sms-csit.yaml
index 474ca8b..4e7f3ab 100644 (file)
--- a/jjb/aaf/aaf-sms-csit.yaml
+++ b/jjb/aaf/aaf-sms-csit.yaml
@@ -8,7 +8,6 @@
       stream: 'master'
       functionality:
         - 'sms-test-plan':
-            trigger_jobs:
-              - 'aaf-sms-master-docker-golang-shell-daily'
+            trigger_jobs: 'aaf-sms-master-docker-golang-shell-daily'
       robot-options: ''
       branch: 'master'

diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
index 1c4f0fd..059340f 100644 (file)
--- a/jjb/aai/aai-csit.yaml
+++ b/jjb/aai/aai-csit.yaml
@@ -12,13 +12,10 @@
           branch: beijing
     functionality:
       - 'resources':
-          trigger_jobs:
-            - 'aai-resources-{stream}-aai-docker-java-daily'
+          trigger_jobs: 'aai-resources-{stream}-aai-docker-java-daily'
       - 'traversal':
-          trigger_jobs:
-            - 'aai-traversal-{stream}-aai-docker-java-daily'
+          trigger_jobs: 'aai-traversal-{stream}-aai-docker-java-daily'
       - 'esr-server':
-          trigger_jobs:
-            - 'aai-esr-server-{stream}-docker-java-daily'
+          trigger_jobs: 'aai-esr-server-{stream}-docker-java-daily'
     robot-options: ''
 

diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml
index 52a53a8..7e4e9cd 100644 (file)
--- a/jjb/appc/appc-csit.yaml
+++ b/jjb/appc/appc-csit.yaml
@@ -10,6 +10,5 @@
           branch: master
     functionality:
       - 'healthcheck':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
+          trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'
     robot-options: ''