Merge "Fix nested trigger_jobs (C-H)"

diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index f1e9570..29d4cd3 100644 (file)
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -16,7 +16,7 @@
     archive-artifacts: ''
 
 - project:
-    name: aaf-cadi-sonar
+    name: aaf-cadi-shiro-sonar
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
@@ -24,6 +24,80 @@
     project: 'aaf/cadi'
     project-name: 'aaf-cadi'
     branch: 'master'
+    mvn-params: '-f shiro/pom.xml'
     mvn-settings: 'aaf-cadi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+# Though the below docker jobs have "aai" in the name, there is no aai code involved.
+- project:
+    name: aaf-cadi-fproxy
+    project-name: 'aaf-cadi-fproxy'
+    jobs:
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'sidecar/fproxy/pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aaf/cadi'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: aaf-cadi-fproxy-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'aaf/cadi'
+    project-name: 'aaf-cadi-fproxy'
+    branch: 'master'
+    mvn-params: '-f sidecar/fproxy/pom.xml'
+    mvn-settings: 'aaf-cadi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aaf-cadi-rproxy
+    project-name: 'aaf-cadi-rproxy'
+    jobs:
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'sidecar/rproxy/pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aaf/cadi'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: aaf-cadi-rproxy-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'aaf/cadi'
+    project-name: 'aaf-cadi-rproxy'
+    branch: 'master'
+    mvn-params: '-f sidecar/rproxy/pom.xml'
+    mvn-settings: 'aaf-cadi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aaf-cadi-tproxy-config
+    project-name: 'aaf-cadi-tproxy-config'
+    jobs:
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'sidecar/tproxy-config/pom.xml'
+          mvn-goals: 'docker:build'
+    project: 'aaf/cadi'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
new file mode 100644 (file)
index 0000000..d42d207
--- /dev/null
+++ b/jjb/appc/appc-parent.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: appc-parent
+    project-name: 'appc-parent'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'appc/parent'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'appc-parent-settings'
+    build-node: ubuntu1604-builder-2c-1g

diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
index 55d66d4..5c9335f 100644 (file)
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'APIs':
-          trigger_jobs:
-            - '{project-name}-{stream}-release-version-java-daily'
+          trigger_jobs: '{project-name}-{stream}-release-version-java-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml
index 9dada47..3b4df5f 100644 (file)
--- a/jjb/msb/msb-csit.yaml
+++ b/jjb/msb/msb-csit.yaml
@@ -8,16 +8,12 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
       - 'rest-service':
-          trigger_jobs:
-            - 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
       - 'tcp-service':
-          trigger_jobs:
-            - 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
       - 'iag-redirect-discovery':
-          trigger_jobs:
-            - 'msb-discovery-master-docker-java-version-shell-daily'
+          trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/multicloud/multicloud-csit.yaml b/jjb/multicloud/multicloud-csit.yaml
index 770df54..1687e9c 100644 (file)
--- a/jjb/multicloud/multicloud-csit.yaml
+++ b/jjb/multicloud/multicloud-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs:
-            - '{project-name}-{stream}-multivimbroker-merge-java'
+          trigger_jobs: '{project-name}-{stream}-multivimbroker-merge-java'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml
index e60ab63..404577d 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml
@@ -8,10 +8,8 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
       - 'hpa-discovery':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
index 2a1d887..f61f66d 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
index a0ea6a6..6d1fc12 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-vmware-master-docker-java-version-shell-daily'
+          trigger_jobs: 'multicloud-openstack-vmware-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
index 34ee201..fa8dfd4 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml
@@ -7,7 +7,6 @@
     stream: 'master'
     functionality:
       - 'functionality1':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml
index 7172e7a..a0dbc81 100644 (file)
--- a/jjb/music/music-csit.yaml
+++ b/jjb/music/music-csit.yaml
@@ -8,8 +8,7 @@
      stream: 'master'
      functionality:
        - 'music-test-plan':
-           trigger_jobs:
-             - 'music-master-docker-version-java-daily'
+           trigger_jobs: 'music-master-docker-version-java-daily'
      robot-options: ''
      branch: 'master'
 

diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml
index 14a64ca..ca94fcd 100644 (file)
--- a/jjb/music/music-distributed-kv-store-csit.yaml
+++ b/jjb/music/music-distributed-kv-store-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'music-distributed-kv-store-test-plan':
-          trigger_jobs:
-            - 'music-distributed-kv-store-master-docker-golang-shell-daily'
+          trigger_jobs: 'music-distributed-kv-store-master-docker-golang-shell-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index 459c498..f0d2156 100644 (file)
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -12,7 +12,6 @@
            branch: beijing
      functionality:
        - 'has':
-           trigger_jobs:
-             - 'optf-has-master-conductor-docker-java-version-shell-daily'
+           trigger_jobs: 'optf-has-master-conductor-docker-java-version-shell-daily'
      robot-options: ''
      branch: 'master'

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index cff6616..321d3ad 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,18 +1,43 @@
 - project:
-    name: policy-csit
+    name: policy-health-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     stream: 'master'
     functionality:
-      - 'health':
-          trigger_jobs:
-            - 'policy-engine-{stream}-merge-scm-mvn-script'
-            - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
-            - 'policy-drools-applications-{stream}-merge-java'
-      - 'apex-pdp':
-          trigger_jobs:
-            - 'policy-apex-pdp-{stream}-merge-scm-mvn-script'
+      - 'health'
+    trigger_jobs:
+      - 'policy-engine-{stream}-merge-scm-mvn-script'
+      - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
+      - 'policy-drools-applications-{stream}-merge-java'
+    robot-options: ''
+    branch: 'master'
+
+- project:
+    name: policy-apex-pdp-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream: 'master'
+    functionality:
+      - 'apex-pdp'
+    trigger_jobs:
+      - 'policy-apex-pdp-{stream}-merge-scm-mvn-script'
+    robot-options: ''
+    branch: 'master'
+
+- project:
+    name: policy-distribution-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream: 'master'
+    functionality:
+      - 'distribution'
+    trigger_jobs:
+      - 'policy-distribution-{stream}-merge-java'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/portal-sdk/portal-sdk-csit.yaml b/jjb/portal-sdk/portal-sdk-csit.yaml
index 111484a..c5667e6 100644 (file)
--- a/jjb/portal-sdk/portal-sdk-csit.yaml
+++ b/jjb/portal-sdk/portal-sdk-csit.yaml
@@ -7,7 +7,6 @@
     stream: 'master'
     functionality:
       - 'testsuite':
-          trigger_jobs:
-            - 'portal-docker-{stream}-merge-docker-script'
+          trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/portal/portal-csit.yaml b/jjb/portal/portal-csit.yaml
index a8e9612..697db46 100644 (file)
--- a/jjb/portal/portal-csit.yaml
+++ b/jjb/portal/portal-csit.yaml
@@ -7,7 +7,6 @@
     stream: 'master'
     functionality:
       - 'testsuite':
-          trigger_jobs:
-            - 'portal-docker-{stream}-merge-docker-script'
+          trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index db3db4c..c5d7261 100644 (file)
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -10,14 +10,11 @@
           branch: 'master'
     functionality:
       - 'sanity':
-          trigger_jobs:
-            - '{project-name}-{stream}-sdc-merge-java'
+          trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
       - 'nightly':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-version-java-daily'
+          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
       - 'uiSanity':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-version-java-daily'
+          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
     robot-options: ''
     branch: 'master'
     html-dir: 'archives'

diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 1cd1eb9..12d6975 100644 (file)
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'healthcheck':
-          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/so/so-csit.yaml b/jjb/so/so-csit.yaml
index 947cde5..288e6f4 100644 (file)
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'integration-testing':
-          trigger_jobs:
-            - 'so-master-docker-version-java-daily'
+          trigger_jobs: 'so-master-docker-version-java-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/usecaseui/usecase-ui-server-csit.yaml b/jjb/usecaseui/usecase-ui-server-csit.yaml
index 96869fd..b348d06 100644 (file)
--- a/jjb/usecaseui/usecase-ui-server-csit.yaml
+++ b/jjb/usecaseui/usecase-ui-server-csit.yaml
@@ -7,7 +7,6 @@
     stream: 'master'
     functionality:
       - 'testsuite':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-java-daily'
+          trigger_jobs: '{project-name}-{stream}-docker-java-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
index 7280f73..9915a44 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
index f8436a6..cc68c4a 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-gvnfm-vnfmgr-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-gvnfm-vnfmgr-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
index afb3ccd..008ef3c 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-gvnfm-vnfres-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-gvnfm-vnfres-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
index 8a4269c..9affcfc 100644 (file)
--- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-nfvo-catalog-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-nfvo-catalog-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
index 3125288..f022d97 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
index f433b06..842d671 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
index 3edde73..8107792 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
index d971176..7342738 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
index f5ad311..d5480c2 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-nfvo-lcm-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-nfvo-lcm-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
index 580443f..4f091ac 100644 (file)
--- a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-nfvo-multivimproxy-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-nfvo-multivimproxy-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
index 354bd37..3f62a53 100644 (file)
--- a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-nfvo-resmanagement-master-docker-java-version-shell-daily'
+          trigger_jobs: 'vfc-nfvo-resmanagement-master-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
index b23a90d..a9fcfdb 100644 (file)
--- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
@@ -7,9 +7,9 @@
     project-name: 'vfc-nfvo-wfengine'
     stream: 'master'
     functionality:
-      - 'sanity-check':
-          trigger_jobs:
-            - 'vfc-nfvo-wfengine-master-engine-activiti-extension-docker-java-version-shell-daily'
-            - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily'
+      - 'sanity-check'
+    trigger_jobs:
+      - 'vfc-nfvo-wfengine-master-engine-activiti-extension-docker-java-version-shell-daily'
+      - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+    branch: 'master'

diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index b1124ab..2b3562f 100644 (file)
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'healthCheck':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-version-java-daily'
+          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
index 56634b5..e34fd74 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
@@ -8,7 +8,6 @@
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs:
-           - '{project-name}-{stream}-merge-java'
+          trigger_jobs: '{project-name}-{stream}-merge-java'
     robot-options: ''
     branch: 'master'