Create Neon jobs and bump fluorine branch

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

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 3f7e3a16c2597900d1041a84ed2918f4bf5ce4df..bd2d1652a691b8b61ac9ee0a1a6dfaa7479b4b29 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -19,16 +19,29 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     email-upstream: '[int/dist]'
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
           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 +151,7 @@
           dependencies: >
               distribution-merge-managed-{stream},
               sxp-merge-{stream},
+              tsdr-merge-{stream},
               unimgr-merge-{stream}
 
 - project: