X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=fe292d19aa05cddc9f0da41a9e69c88851c8f91b;hb=fc9bf069d4ffa62713ebc403d891e826cd705568;hp=8a63b58a949c8f5b2f57663018025344ce98d5d7;hpb=6a2a617621a8de6d9230d64f20d40ddd9469a907;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 8a63b58a9..fe292d19a 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -19,32 +19,37 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     email-upstream: '[int/dist]'
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
               mvn:org.opendaylight.sxp/features-sxp//xml/features,
-              mvn:org.opendaylight.tsdr/features-tsdr//xml/features
+              mvn:org.opendaylight.telemetry/features-telemetry//xml/features
+          sm-features: >
+              odl-sxp-routing,
+              odl-telemetry-collector,
+              odl-telemetry-configurator,
+              odl-telemetry-all
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          # Self-Managed projects repos and features:
+          sm-repos: >
+              mvn:org.opendaylight.sxp/features-sxp//xml/features,
+              mvn:org.opendaylight.telemetry/features-telemetry//xml/features
           sm-features: >
               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-telemetry-collector,
+              odl-telemetry-configurator,
+              odl-telemetry-all
       - 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.transportpce/features-transportpce//xml/features,
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
           sm-features: >
               odl-sxp-routing,
               odl-transportpce,
@@ -78,7 +83,7 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           dependencies: >
               aaa-merge-{stream},
@@ -97,6 +102,25 @@
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
+      - neon:
+          branch: 'stable/neon'
+          dependencies: >
+              aaa-merge-{stream},
+              bgpcep-merge-{stream},
+              coe-merge-{stream},
+              controller-merge-{stream},
+              daexim-merge-{stream},
+              genius-merge-{stream},
+              infrautils-merge-{stream},
+              lispflowmapping-merge-{stream},
+              mdsal-merge-{stream},
+              netconf-merge-{stream},
+              netvirt-merge-{stream}
+              neutron-merge-{stream},
+              openflowplugin-merge-{stream},
+              ovsdb-merge-{stream},
+              serviceutils-merge-{stream},
+              sfc-merge-{stream}
       - fluorine:
           branch: 'stable/fluorine'
           dependencies: >
@@ -176,14 +200,24 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
               sxp-merge-{stream},
+              telemetry-merge-{stream},
               tsdr-merge-{stream},
-              unimgr-merge-{stream},
+              unimgr-merge-{stream}
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              sxp-merge-{stream},
+              telemetry-merge-{stream},
+              tsdr-merge-{stream},
+              unimgr-merge-{stream}
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
@@ -193,7 +227,7 @@
               sxp-merge-{stream},
               transportpce-merge-{stream},
               tsdr-merge-{stream},
-              unimgr-merge-{stream},
+              unimgr-merge-{stream}
 
 - project:
     name: distribution-release
@@ -214,9 +248,12 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
 
+      - neon:
+          branch: 'stable/neon'
+
       - fluorine:
           branch: 'stable/fluorine'