X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=773ab3f6fb3cff29916cac9259b02a83fb318d05;hb=807fca79b9cbd070495690797e1b0cc019caf5f9;hp=c7d8c96ebaa4c7e0da3df0dd7f00658beaad41b5;hpb=3a5bc6484511bd9543ae0cd01dc36dd7564482d9;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index c7d8c96eb..773ab3f6f 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -19,60 +19,42 @@
     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.unimgr/features4-unimgr//xml/features
+              mvn:org.opendaylight.telemetry/features-telemetry//xml/features
+          sm-features: >
+              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.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.snmp4sdn/features-snmp4sdn//xml/features,
-              mvn:org.opendaylight.sxp/features-sxp//xml/features,
-              mvn:org.opendaylight.transportpce/features-transportpce//xml/features,
-              mvn:org.opendaylight.tsdr/features-tsdr//xml/features,
-              mvn:org.opendaylight.unimgr/features4-unimgr//xml/features
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
           sm-features: >
-              odl-snmp4sdn-snmp4sdn
-              odl-sxp-routing,
               odl-transportpce,
               odl-transportpce-api,
               odl-transportpce-ordmodels,
-              odl-transportpce-stubmodels,
-              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,
-              odl-unimgr-template-driver,
-              odl-unimgr-cisco-xr-driver,
-              odl-unimgr-ovs-driver
+              odl-transportpce-stubmodels
+
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4
+          disable-job: 'true'
 
 - project:
     name: distribution-managed
@@ -96,7 +78,7 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           dependencies: >
               aaa-merge-{stream},
@@ -115,6 +97,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: >
@@ -137,6 +138,7 @@
 
       - oxygen:
           branch: 'stable/oxygen'
+          disable-job: true
           dependencies: >
               aaa-merge-{stream},
               alto-merge-{stream},
@@ -194,29 +196,32 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              sxp-merge-{stream},
-              tsdr-merge-{stream},
-              unimgr-merge-{stream},
+              telemetry-merge-{stream}
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              telemetry-merge-{stream}
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              snmp4sdn-merge-{stream},
-              sxp-merge-{stream},
-              transportpce-merge-{stream},
-              tsdr-merge-{stream},
-              unimgr-merge-{stream},
+              transportpce-merge-{stream}
 
 - project:
     name: distribution-release
     jobs:
-      - gerrit-maven-stage
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          mvn-central: true
+          ossrh-profile-id: 6386ebbbf3a563
 
     project: 'integration/distribution'
     project-name: 'distribution'
@@ -229,9 +234,12 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
 
+      - neon:
+          branch: 'stable/neon'
+
       - fluorine:
           branch: 'stable/fluorine'