X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=b01f86ccb4e96d76364c9f16ebb1b5923c9fc059;hb=3f74d54d316d9ee1648aa645be5dc71fe5b6cfa3;hp=512e64b64f3cb6c8639651d25db5b9d7f8f61350;hpb=68d5ad1dacd827809cbe4a4752dd96259bbe389f;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 512e64b64..b01f86ccb 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -25,7 +25,7 @@
           # 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.tsdr/features-tsdr//xml/features
           sm-features: >
               odl-sxp-routing,
               odl-tsdr-core,
@@ -37,33 +37,21 @@
               odl-tsdr-cassandra,
               odl-tsdr-hbase,
               odl-tsdr-hsqldb,
-              odl-tsdr-elasticsearch,
+              odl-tsdr-elasticsearch
       - 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,
           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-transportpce-stubmodels
+
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4
@@ -195,6 +183,7 @@
               distribution-merge-managed-{stream},
               sxp-merge-{stream},
               tsdr-merge-{stream},
+              unimgr-merge-{stream},
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
@@ -204,6 +193,29 @@
               sxp-merge-{stream},
               transportpce-merge-{stream},
               tsdr-merge-{stream},
+              unimgr-merge-{stream},
+
+- project:
+    name: distribution-release
+    jobs:
+      - gerrit-maven-stage
+
+    project: 'integration/distribution'
+    project-name: 'distribution'
+    mvn-goals: 'clean deploy -f opendaylight/pom.xml'
+    mvn-settings: 'integration-distribution-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    email-upstream: '[int/dist]'
+
+    # Used by the release job
+    staging-profile-id: 2af042ed81d5e2
+
+    stream:
+      - neon:
+          branch: 'master'
+
+      - fluorine:
+          branch: 'stable/fluorine'
 
 - project:
     name: distribution-sonar
@@ -217,8 +229,9 @@
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: distribution
-    description: 'List of distribution jobs'
-    regex: '^(integration-)?distribution-.*'
-    <<: *releng_view_common
+- project:
+    name: distribution-view
+    views:
+      - common-view
+    view-name: distribution
+    view-regex: '^(integration-)?distribution-.*'