X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=356241a779ba2b3dd06f98dbfe8e4c20ad9c3630;hb=6632a5342479c09112b04e7fdd54f3c58d16c042;hp=30cfc318aa8ff8b17510854ad2c97e0081b9bcf5;hpb=c9368b4395a096cd5d7149fbe8cfde727ef16585;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 30cfc318a..356241a77 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -16,67 +16,46 @@
     project-name: distribution
     mvn-settings: integration-distribution-settings
     mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+    nexus-iq-namespace: odl-
+    nexus-iq-stage: release
     email-upstream: '[int/dist]'
     stream:
-      - neon:
+      - magnesium:
           branch: 'master'
+          java-version: openjdk11
+          karaf-version: odl
+      - sodium:
+          branch: 'stable/sodium'
           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.transportpce/features-transportpce//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-unimgr,
-              odl-unimgr-template-driver,
-              odl-unimgr-cisco-xr-driver,
-              odl-unimgr-ovs-driver,
+              odl-transportpce,
+              odl-transportpce-api,
+              odl-transportpce-ordmodels
+      - 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.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,
-      - oxygen:
-          branch: 'stable/oxygen'
-          karaf-version: karaf4
+              odl-transportpce-stubmodels
 
 - project:
     name: distribution-managed
@@ -91,7 +70,7 @@
     project-name: distribution
     mvn-settings: integration-distribution-settings
     mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     email-upstream: '[int/dist]'
     type: managed
     profile: '-Pmanaged'
@@ -100,8 +79,27 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - neon:
+      - magnesium:
           branch: 'master'
+          java-version: openjdk11
+          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},
+      - sodium:
+          branch: 'stable/sodium'
           dependencies: >
               aaa-merge-{stream},
               bgpcep-merge-{stream},
@@ -119,8 +117,8 @@
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           dependencies: >
               aaa-merge-{stream},
               bgpcep-merge-{stream},
@@ -138,44 +136,25 @@
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
-
-      - oxygen:
-          branch: 'stable/oxygen'
+      - fluorine:
+          branch: 'stable/fluorine'
           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}
 
 - project:
     name: distribution-full
@@ -189,7 +168,7 @@
     project-name: distribution
     mvn-settings: integration-distribution-settings
     mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     email-upstream: '[int/dist]'
     type: full
     profile: '-Punmanaged'
@@ -198,44 +177,56 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - neon:
+      - magnesium:
           branch: 'master'
+          java-version: openjdk11
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              sxp-merge-{stream},
-              tsdr-merge-{stream},
-              unimgr-merge-{stream},
+      - sodium:
+          branch: 'stable/sodium'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              transportpce-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},
-              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
+      - gerrit-release-merge
 
     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'
+    mvn-opts: '-Xmx1024m'
     email-upstream: '[int/dist]'
 
     # Used by the release job
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - neon:
+      - magnesium:
           branch: 'master'
-
+          java-version: openjdk11
+      - sodium:
+          branch: 'stable/sodium'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
 
@@ -249,10 +240,11 @@
     branch: master
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
-- 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-.*'