X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=aa385c0570c02ab81161e670879c5be606bbe8dd;hb=6aad4a9bd5ef29209ec9760ec736724a8b88bdda;hp=510197c60231dd04573906c6fc10e794d9d9ba2a;hpb=6296d9910277f5fcc25862cb417e1d8c2fedeff8;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 510197c60..aa385c057 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -16,39 +16,27 @@
     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:
       - 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.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,
               mvn:org.opendaylight.transportpce/features-transportpce//xml/features
           sm-features: >
-              odl-telemetry-collector,
-              odl-telemetry-configurator,
-              odl-telemetry-all,
               odl-transportpce,
               odl-transportpce-api,
               odl-transportpce-ordmodels
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
@@ -56,8 +44,7 @@
           sm-features: >
               odl-transportpce,
               odl-transportpce-api,
-              odl-transportpce-ordmodels,
-              odl-transportpce-stubmodels
+              odl-transportpce-ordmodels
 
 - project:
     name: distribution-managed
@@ -72,7 +59,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'
@@ -81,8 +68,27 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
+          java-version: 'openjdk11'
+          dependencies: >
+              aaa-maven-merge-{stream},
+              bgpcep-maven-merge-{stream},
+              coe-maven-merge-{stream},
+              controller-maven-merge-{stream},
+              daexim-maven-merge-{stream},
+              genius-maven-merge-{stream},
+              infrautils-maven-merge-{stream},
+              lispflowmapping-maven-merge-{stream},
+              mdsal-maven-merge-{stream},
+              netconf-maven-merge-{stream},
+              netvirt-maven-merge-{stream}
+              neutron-maven-merge-{stream},
+              openflowplugin-maven-merge-{stream},
+              ovsdb-maven-merge-{stream},
+              serviceutils-maven-merge-{stream},
+      - sodium:
+          branch: 'stable/sodium'
           dependencies: >
               aaa-merge-{stream},
               bgpcep-merge-{stream},
@@ -119,25 +125,6 @@
               ovsdb-merge-{stream},
               serviceutils-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
@@ -151,7 +138,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'
@@ -160,21 +147,20 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
+          java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              telemetry-merge-{stream}
-      - neon:
-          branch: 'stable/neon'
+      - sodium:
+          branch: 'stable/sodium'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              telemetry-merge-{stream},
               transportpce-merge-{stream}
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
@@ -185,29 +171,27 @@
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
-          mvn-central: true
-          ossrh-profile-id: 6386ebbbf3a563
+      - gerrit-release-merge
 
     project: 'integration/distribution'
     project-name: 'distribution'
-    mvn-goals: 'clean deploy -f opendaylight/pom.xml'
+    mvn-goals: 'clean deploy -f onap-karaf/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:
-      - sodium:
+      - magnesium:
           branch: 'master'
-
+          java-version: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
 
-      - fluorine:
-          branch: 'stable/fluorine'
-
 - project:
     name: distribution-sonar
     jobs:
@@ -216,9 +200,10 @@
     project: integration/distribution
     project-name: distribution
     branch: master
+    java-version: 'openjdk11'
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: distribution-view