X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=3f7646034f2741660a9a36e5f837b208523d89e6;hb=73db6e3816a507f0c12edede5d8951c488800bda;hp=95a30eefa8ab68f649dfb300c0b5d7ae1fe0ea6d;hpb=717dd9920056948c411c5d2238f9395d2eb295b0;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 95a30eefa..3f7646034 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -19,15 +19,37 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     email-upstream: '[int/dist]'
     stream:
-      - fluorine:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           # Self-Managed projects repos and features:
-          sm-repos: mvn:org.opendaylight.sxp/features-sxp//xml/features
-          sm-features: odl-sxp-routing
-      - oxygen:
-          branch: 'stable/oxygen'
-          karaf-version: karaf4
+          sm-repos: >
+              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.transportpce/features-transportpce//xml/features
+          sm-features: >
+              odl-transportpce,
+              odl-transportpce-api,
+              odl-transportpce-ordmodels
+      - fluorine:
+          branch: 'stable/fluorine'
+          karaf-version: odl
+          # Self-Managed projects repos and features:
+          sm-repos: >
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
+          sm-features: >
+              odl-transportpce,
+              odl-transportpce-api,
+              odl-transportpce-ordmodels,
+              odl-transportpce-stubmodels
 
 - project:
     name: distribution-managed
@@ -48,9 +70,10 @@
     profile: '-Pmanaged'
     forbidden-files: 'opendaylight/**'
     karaf-version: karaf4
+    dist-pom: 'distribution/pom.xml'
 
     stream:
-      - fluorine:
+      - sodium:
           branch: 'master'
           dependencies: >
               aaa-merge-{stream},
@@ -69,44 +92,44 @@
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
-
-      - oxygen:
-          branch: 'stable/oxygen'
+      - neon:
+          branch: 'stable/neon'
           dependencies: >
               aaa-merge-{stream},
-              alto-merge-{stream},
               bgpcep-merge-{stream},
-              bier-merge-{stream},
               coe-merge-{stream},
               controller-merge-{stream},
               daexim-merge-{stream},
-              dluxapps-merge-{stream},
-              dlux-merge-{stream},
-              faas-merge-{stream},
               genius-merge-{stream},
-              groupbasedpolicy-merge-{stream},
               infrautils-merge-{stream},
-              jsonrpc-merge-{stream},
-              l2switch-merge-{stream},
               lispflowmapping-merge-{stream},
               mdsal-merge-{stream},
-              nemo-merge-{stream},
               netconf-merge-{stream},
-              netvirt-merge-{stream},
+              netvirt-merge-{stream}
               neutron-merge-{stream},
-              of-config-merge-{stream},
               openflowplugin-merge-{stream},
               ovsdb-merge-{stream},
-              p4plugin-merge-{stream},
-              packetcable-merge-{stream},
               serviceutils-merge-{stream},
-              sfc-merge-{stream},
-              snmp4sdn-merge-{stream},
-              snmp-merge-{stream},
-              sxp-merge-{stream},
-              tsdr-merge-{stream},
-              usc-merge-{stream},
-              vbd-merge-{stream}
+              sfc-merge-{stream}
+      - fluorine:
+          branch: 'stable/fluorine'
+          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}
 
 - project:
     name: distribution-full
@@ -126,14 +149,55 @@
     profile: '-Punmanaged'
     files: 'opendaylight/**'
     karaf-version: odl
+    dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - fluorine:
+      - sodium:
           branch: 'master'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              sxp-merge-{stream}
+              telemetry-merge-{stream}
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              transportpce-merge-{stream}
+      - fluorine:
+          branch: 'stable/fluorine'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              transportpce-merge-{stream}
+
+- project:
+    name: distribution-release
+    jobs:
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          mvn-central: true
+          ossrh-profile-id: 6386ebbbf3a563
+
+    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:
+      - sodium:
+          branch: 'master'
+
+      - neon:
+          branch: 'stable/neon'
+
+      - fluorine:
+          branch: 'stable/fluorine'
 
 - project:
     name: distribution-sonar
@@ -147,8 +211,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-.*'