Improve formatting of trigger list to be more maintainable

Change-Id: I7bc0473b825e9e3a6aab843f32c801c2cca49327
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/integration-csit-basic-stable-helium.yaml b/jjb/integration/integration-csit-basic-stable-helium.yaml
index 364c8bdf061d5d3be657f50b66c281e807f2bb07..6347ba0058acf7d85fdf6ab84f025950a6407a04 100644 (file)
--- a/jjb/integration/integration-csit-basic-stable-helium.yaml
+++ b/jjb/integration/integration-csit-basic-stable-helium.yaml
@@ -29,5 +29,9 @@
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream},integration-distribution-merge-{stream}'
-
+    trigger-jobs: >
+        odlparent-distribution-{stream},
+        yangtools-distribution-{stream},
+        controller-distribution-{stream},
+        aaa-distribution-{stream},
+        integration-distribution-merge-{stream},

diff --git a/jjb/integration/integration-csit-basic.yaml b/jjb/integration/integration-csit-basic.yaml
index 7865912661941c1ea678abe08ac3395b1f0fb099..6da333c88c17efb67c4e1a36be977788304de26c 100644 (file)
--- a/jjb/integration/integration-csit-basic.yaml
+++ b/jjb/integration/integration-csit-basic.yaml
@@ -35,5 +35,9 @@
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream},integration-distribution-merge-{stream}'
-
+    trigger-jobs: >
+        odlparent-distribution-{stream},
+        yangtools-distribution-{stream},
+        controller-distribution-{stream},
+        aaa-distribution-{stream},
+        integration-distribution-merge-{stream},

diff --git a/jjb/integration/integration-jobs.yaml b/jjb/integration/integration-jobs.yaml
index 1b1bedcd3addad937dfee5926214734fe8c1b045..3e097fbffbd68e04c7ba295140c158db9004ad3d 100644 (file)
--- a/jjb/integration/integration-jobs.yaml
+++ b/jjb/integration/integration-jobs.yaml
@@ -12,20 +12,116 @@
     stream:
         - master:
             branch: 'master'
-            csit-list: 'aaa-csit-1node-cds-authn-only-{stream},aaa-csit-1node-cds-authn-all-{stream},bgpcep-csit-1node-cds-userfeatures-only-{stream},bgpcep-csit-1node-cds-userfeatures-all-{stream},capwap-csit-1node-cds-ac-only-{stream},capwap-csit-1node-cds-ac-all-{stream},controller-csit-1node-cds-netconf-only-{stream},controller-csit-1node-cds-netconf-all-{stream},integration-csit-3node-cds-basic-only-{stream},integration-csit-3node-cds-basic-all-{stream},integration-distribution-offline-{stream},l2switch-csit-1node-cds-switch-only-{stream},l2switch-csit-1node-cds-switch-all-{stream},l2switch-csit-1node-cds-scalability-only-{stream},l2switch-csit-1node-cds-scalability-all-{stream},lispflowmapping-csit-1node-cds-all-only-{stream},lispflowmapping-csit-1node-cds-all-all-{stream},openflowplugin-csit-1node-cds-flow-services-only-{stream},openflowplugin-csit-1node-cds-flow-services-all-{stream},openflowplugin-csit-1node-cds-flow-services-more-only-{stream},openflowplugin-csit-1node-cds-flow-services-more-all-{stream},openflowplugin-csit-1node-cds-scalability-only-{stream},openflowplugin-csit-1node-cds-scalability-all-{stream},openflowplugin-csit-1node-cds-cbench-performance-only-{stream},openflowplugin-csit-1node-cds-config-performance-only-{stream},ovsdb-csit-1node-cds-southbound-only-{stream},ovsdb-csit-1node-cds-southbound-all-{stream},snmp-csit-1node-cds-basic-only-{stream},snmp-csit-1node-cds-basic-all-{stream},tsdr-csit-1node-cds-h2-datastore-only-{stream},tsdr-csit-1node-cds-h2-datastore-all-{stream},tsdr-csit-1node-cds-hbase-datastore-only-{stream},tsdr-csit-1node-cds-hbase-datastore-all-{stream},usc-csit-1node-cds-channel-only-{stream},usc-csit-1node-cds-channel-all-{stream},vpnservice-csit-1node-cds-vpnservice-only-{stream},vpnservice-csit-1node-cds-vpnservice-all-{stream},vtn-csit-1node-cds-manager-only-{stream},vtn-csit-1node-cds-manager-all-{stream}'
+            csit-list: >
+                aaa-csit-1node-cds-authn-only-{stream},
+                aaa-csit-1node-cds-authn-all-{stream},
+                bgpcep-csit-1node-cds-userfeatures-only-{stream},
+                bgpcep-csit-1node-cds-userfeatures-all-{stream},
+                capwap-csit-1node-cds-ac-only-{stream},
+                capwap-csit-1node-cds-ac-all-{stream},
+                controller-csit-1node-cds-netconf-only-{stream},
+                controller-csit-1node-cds-netconf-all-{stream},
+                integration-csit-3node-cds-basic-only-{stream},
+                integration-csit-3node-cds-basic-all-{stream},
+                integration-distribution-offline-{stream},
+                l2switch-csit-1node-cds-switch-only-{stream},
+                l2switch-csit-1node-cds-switch-all-{stream},
+                l2switch-csit-1node-cds-scalability-only-{stream},
+                l2switch-csit-1node-cds-scalability-all-{stream},
+                lispflowmapping-csit-1node-cds-all-only-{stream},
+                lispflowmapping-csit-1node-cds-all-all-{stream},
+                openflowplugin-csit-1node-cds-flow-services-only-{stream},
+                openflowplugin-csit-1node-cds-flow-services-all-{stream},
+                openflowplugin-csit-1node-cds-flow-services-more-only-{stream},
+                openflowplugin-csit-1node-cds-flow-services-more-all-{stream},
+                openflowplugin-csit-1node-cds-scalability-only-{stream},
+                openflowplugin-csit-1node-cds-scalability-all-{stream},
+                openflowplugin-csit-1node-cds-cbench-performance-only-{stream},
+                openflowplugin-csit-1node-cds-config-performance-only-{stream},
+                ovsdb-csit-1node-cds-southbound-only-{stream},
+                ovsdb-csit-1node-cds-southbound-all-{stream},
+                snmp-csit-1node-cds-basic-only-{stream},
+                snmp-csit-1node-cds-basic-all-{stream},
+                tsdr-csit-1node-cds-h2-datastore-only-{stream},
+                tsdr-csit-1node-cds-h2-datastore-all-{stream},
+                tsdr-csit-1node-cds-hbase-datastore-only-{stream},
+                tsdr-csit-1node-cds-hbase-datastore-all-{stream},
+                usc-csit-1node-cds-channel-only-{stream},
+                usc-csit-1node-cds-channel-all-{stream},
+                vpnservice-csit-1node-cds-vpnservice-only-{stream},
+                vpnservice-csit-1node-cds-vpnservice-all-{stream},
+                vtn-csit-1node-cds-manager-only-{stream},
+                vtn-csit-1node-cds-manager-all-{stream},
 
         - stable-lithium:
             branch: 'stable/lithium'
-            csit-list: 'aaa-csit-1node-cds-authn-only-{stream},aaa-csit-1node-cds-authn-all-{stream},bgpcep-csit-1node-cds-userfeatures-only-{stream},bgpcep-csit-1node-cds-userfeatures-all-{stream},capwap-csit-1node-cds-ac-only-{stream},capwap-csit-1node-cds-ac-all-{stream},controller-csit-1node-cds-netconf-only-{stream},controller-csit-1node-cds-netconf-all-{stream},integration-csit-3node-cds-basic-only-{stream},integration-csit-3node-cds-basic-all-{stream},integration-distribution-offline-{stream},l2switch-csit-1node-cds-switch-only-{stream},l2switch-csit-1node-cds-switch-all-{stream},l2switch-csit-1node-cds-scalability-only-{stream},l2switch-csit-1node-cds-scalability-all-{stream},lispflowmapping-csit-1node-cds-all-only-{stream},lispflowmapping-csit-1node-cds-all-all-{stream},openflowplugin-csit-1node-cds-flow-services-only-{stream},openflowplugin-csit-1node-cds-flow-services-all-{stream},openflowplugin-csit-1node-cds-flow-services-more-only-{stream},openflowplugin-csit-1node-cds-flow-services-more-all-{stream},openflowplugin-csit-1node-cds-scalability-only-{stream},openflowplugin-csit-1node-cds-scalability-all-{stream},openflowplugin-csit-1node-cds-cbench-performance-only-{stream},openflowplugin-csit-1node-cds-config-performance-only-{stream},ovsdb-csit-1node-cds-southbound-only-{stream},ovsdb-csit-1node-cds-southbound-all-{stream},snmp-csit-1node-cds-basic-only-{stream},snmp-csit-1node-cds-basic-all-{stream},usc-csit-1node-cds-channel-only-{stream},usc-csit-1node-cds-channel-all-{stream},vpnservice-csit-1node-cds-vpnservice-only-{stream},vpnservice-csit-1node-cds-vpnservice-all-{stream},vtn-csit-1node-cds-manager-only-{stream},vtn-csit-1node-cds-manager-all-{stream}'
+            csit-list: >
+                aaa-csit-1node-cds-authn-only-{stream},
+                aaa-csit-1node-cds-authn-all-{stream},
+                bgpcep-csit-1node-cds-userfeatures-only-{stream},
+                bgpcep-csit-1node-cds-userfeatures-all-{stream},
+                capwap-csit-1node-cds-ac-only-{stream},
+                capwap-csit-1node-cds-ac-all-{stream},
+                controller-csit-1node-cds-netconf-only-{stream},
+                controller-csit-1node-cds-netconf-all-{stream},
+                integration-csit-3node-cds-basic-only-{stream},
+                integration-csit-3node-cds-basic-all-{stream},
+                integration-distribution-offline-{stream},
+                l2switch-csit-1node-cds-switch-only-{stream},
+                l2switch-csit-1node-cds-switch-all-{stream},
+                l2switch-csit-1node-cds-scalability-only-{stream},
+                l2switch-csit-1node-cds-scalability-all-{stream},
+                lispflowmapping-csit-1node-cds-all-only-{stream},
+                lispflowmapping-csit-1node-cds-all-all-{stream},
+                openflowplugin-csit-1node-cds-flow-services-only-{stream},
+                openflowplugin-csit-1node-cds-flow-services-all-{stream},
+                openflowplugin-csit-1node-cds-flow-services-more-only-{stream},
+                openflowplugin-csit-1node-cds-flow-services-more-all-{stream},
+                openflowplugin-csit-1node-cds-scalability-only-{stream},
+                openflowplugin-csit-1node-cds-scalability-all-{stream},
+                openflowplugin-csit-1node-cds-cbench-performance-only-{stream},
+                openflowplugin-csit-1node-cds-config-performance-only-{stream},
+                ovsdb-csit-1node-cds-southbound-only-{stream},
+                ovsdb-csit-1node-cds-southbound-all-{stream},
+                snmp-csit-1node-cds-basic-only-{stream},
+                snmp-csit-1node-cds-basic-all-{stream},
+                usc-csit-1node-cds-channel-only-{stream},
+                usc-csit-1node-cds-channel-all-{stream},
+                vpnservice-csit-1node-cds-vpnservice-only-{stream},
+                vpnservice-csit-1node-cds-vpnservice-all-{stream},
+                vtn-csit-1node-cds-manager-only-{stream},
+                vtn-csit-1node-cds-manager-all-{stream},
 
         - stable-helium:
             branch: 'stable/helium'
-            csit-list: 'aaa-csit-1node-imds-authn-only-{stream},aaa-csit-1node-imds-authn-all-{stream},controller-csit-1node-imds-netconf-only-{stream},controller-csit-1node-imds-netconf-all-{stream},controller-csit-1node-imds-nsf-only-{stream},controller-csit-1node-imds-nsf-all-{stream},integration-csit-3node-cds-basic-only-{stream},integration-csit-3node-cds-basic-all-{stream},integration-distribution-offline-{stream},l2switch-csit-1node-imds-switch-only-{stream},l2switch-csit-1node-imds-switch-all-{stream},lispflowmapping-csit-1node-imds-all-only-{stream},lispflowmapping-csit-1node-imds-all-all-{stream},openflowplugin-csit-1node-imds-flow-services-only-{stream},openflowplugin-csit-1node-imds-flow-services-all-{stream},vtn-csit-1node-imds-manager-only-{stream},vtn-csit-1node-imds-manager-all-{stream}'
+            csit-list: >
+                aaa-csit-1node-imds-authn-only-{stream},
+                aaa-csit-1node-imds-authn-all-{stream},
+                controller-csit-1node-imds-netconf-only-{stream},
+                controller-csit-1node-imds-netconf-all-{stream},
+                controller-csit-1node-imds-nsf-only-{stream},
+                controller-csit-1node-imds-nsf-all-{stream},
+                integration-csit-3node-cds-basic-only-{stream},
+                integration-csit-3node-cds-basic-all-{stream},
+                integration-distribution-offline-{stream},
+                l2switch-csit-1node-imds-switch-only-{stream},
+                l2switch-csit-1node-imds-switch-all-{stream},
+                lispflowmapping-csit-1node-imds-all-only-{stream},
+                lispflowmapping-csit-1node-imds-all-all-{stream},
+                openflowplugin-csit-1node-imds-flow-services-only-{stream},
+                openflowplugin-csit-1node-imds-flow-services-all-{stream},
+                vtn-csit-1node-imds-manager-only-{stream},
+                vtn-csit-1node-imds-manager-all-{stream},
 
     jdk: 'openjdk7'
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream},integration-distribution-merge-{stream}'
+    trigger-jobs: >
+        odlparent-distribution-{stream},
+        yangtools-distribution-{stream},
+        controller-distribution-{stream},
+        aaa-distribution-{stream},
+        integration-distribution-merge-{stream},
 
 - job-template:
     name: 'integration-csit-verify-{stream}'