From e26c971aa9d0ecefd62a295a3d17c6b03dc8598d Mon Sep 17 00:00:00 2001 From: scottmelton Date: Wed, 1 Aug 2018 17:56:39 -0700 Subject: [PATCH] Add TSDR to distribution sanity test JIRA:TSDR-75 Change-Id: Id926bc21a5d58063a9c1706d6943948f608d520d Signed-off-by: scottmelton --- .../distribution/distribution-jobs.yaml | 20 +++++++++++++++---- jjb/tsdr/tsdr-csit-cassandra.yaml | 3 +++ jjb/tsdr/tsdr-csit-elasticsearch.yaml | 3 +++ jjb/tsdr/tsdr-csit-hbase.yaml | 3 +++ jjb/tsdr/tsdr-csit-hsqldb.yaml | 3 +++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 3f7e3a16c2..1792c171ff 100644 --- 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 e173dc988d..66c28d422f 100644 --- 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 ad5229baee..906577b5b7 100644 --- 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 6b1c235c4f..6891055820 100644 --- 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 a9fbd47610..fcffa2ac07 100644 --- 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' -- 2.36.6