Add TSDR to distribution sanity test

JIRA:TSDR-75

Change-Id: Id926bc21a5d58063a9c1706d6943948f608d520d
Signed-off-by: scottmelton <smelton2@uccs.edu>

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 3f7e3a16c2597900d1041a84ed2918f4bf5ce4df..1792c171ff3217e512f7ef4a402a53ae1473257c 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -24,11 +24,22 @@
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
-            mvn:org.opendaylight.sxp/features-sxp//xml/features,
-            mvn:org.opendaylight.unimgr/features4-unimgr//xml/features
+              mvn:org.opendaylight.sxp/features-sxp//xml/features,
+              mvn:org.opendaylight.tsdr/features-tsdr//xml/features,
+              mvn:org.opendaylight.unimgr/features4-unimgr//xml/features
           sm-features: >
-            odl-sxp-routing,
-            odl-unimgr-rest
+              odl-sxp-routing,
+              odl-tsdr-core,
+              odl-tsdr-openflow-statistics-collector,
+              odl-tsdr-netflow-statistics-collector,
+              odl-tsdr-restconf-collector,
+              odl-tsdr-syslog-collector,
+              odl-tsdr-controller-metrics-collector,
+              odl-tsdr-cassandra,
+              odl-tsdr-hbase,
+              odl-tsdr-hsqldb,
+              odl-tsdr-elasticsearch,
+              odl-unimgr-rest
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4
@@ -138,6 +149,7 @@
           dependencies: >
               distribution-merge-managed-{stream},
               sxp-merge-{stream},
+              tsdr-merge-{stream},
               unimgr-merge-{stream}
 
 - project:

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index e173dc988d933f896891b6f6282007fc71590f54..66c28d422f0b051636def09f81f4584a6f1600ea 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -15,6 +15,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
 

diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
index ad5229baee45ac7adf91aff26218d64864d5e4fe..906577b5b7469cf0d610151085656c3517d4f22a 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -15,6 +15,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
 

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index 6b1c235c4ff93fbd4d09a79d36e9b87d121115a4..689105582025ad0dd99b6a2aefc562231857b4bc 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -15,6 +15,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
 

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index a9fbd4761062d821184479335b1e7fbe01936cc9..fcffa2ac0701e8d251de6c180bc6a0f85f886015 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -15,6 +15,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'