X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=fe292d19aa05cddc9f0da41a9e69c88851c8f91b;hb=refs%2Fchanges%2F25%2F80125%2F1;hp=004b1e79622dca93cd68567ff4266a5fa4045ea4;hpb=69c3ad1a710d68e874012618f7dccfaffd7d011c;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 004b1e796..fe292d19a 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -19,7 +19,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     email-upstream: '[int/dist]'
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           # Self-Managed projects repos and features:
@@ -31,6 +31,18 @@
               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-telemetry-collector,
+              odl-telemetry-configurator,
+              odl-telemetry-all
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
@@ -71,7 +83,7 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           dependencies: >
               aaa-merge-{stream},
@@ -90,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: >
@@ -169,7 +200,7 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           dependencies: >
@@ -178,6 +209,15 @@
               telemetry-merge-{stream},
               tsdr-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
@@ -208,9 +248,12 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
 
+      - neon:
+          branch: 'stable/neon'
+
       - fluorine:
           branch: 'stable/fluorine'