Merge "Set triggers for integration jobs & adjust offline job"

[releng/builder.git] / jjb / integration / integration-jobs.yaml

diff --git a/jjb/integration/integration-jobs.yaml b/jjb/integration/integration-jobs.yaml
index 5e083a7e5b7045b9b7ba4ab5611bc9ff321dddcc..189f1be668fb04c1ce1e863edfe0f4bd1f886259 100644 (file)
--- a/jjb/integration/integration-jobs.yaml
+++ b/jjb/integration/integration-jobs.yaml
@@ -12,22 +12,20 @@
     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},controller-csit-1node-cds-netconf-only-{stream},controller-csit-1node-cds-netconf-all-{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},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},controller-csit-1node-cds-netconf-only-{stream},controller-csit-1node-cds-netconf-all-{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},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},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'
 
-# For the Job templates below replace instances of:
-# PROJECT with your project name (eg. controller)
-# MAVEN_GOALS with your maven goals to build
-# MAVEN_OPTS with your maven options to build
+    # Trigger jobs (upstream dependencies)
+    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}'
@@ -232,7 +230,9 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - reverse:
+            jobs: '{trigger-jobs}'
+            result: 'success'
 
     builders:
         - integration-deploy-controller-offline