X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=772ba0750bc1301e466e7bb0a21d78c6080cc4bc;hb=b2fd073a1f288560ff251bbcf700478ee00b0a8d;hp=6ce2415d245d475bab7c6b31ebf64bf7faf46067;hpb=2b6b1d3d15aa11e8f99900821f54fcadfab96904;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 6ce2415d2..772ba0750 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -16,20 +16,22 @@
     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:
+      - aluminium:
           branch: 'master'
+          jre: 'openjdk11'
+          karaf-version: odl
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
           karaf-version: odl
       - sodium:
           branch: 'stable/sodium'
           karaf-version: odl
-      - neon:
-          branch: 'stable/neon'
-          karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
               mvn:org.opendaylight.transportpce/features-transportpce//xml/features
@@ -37,8 +39,8 @@
               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: >
@@ -46,8 +48,7 @@
           sm-features: >
               odl-transportpce,
               odl-transportpce-api,
-              odl-transportpce-ordmodels,
-              odl-transportpce-stubmodels
+              odl-transportpce-ordmodels
 
 - project:
     name: distribution-managed
@@ -62,7 +63,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'
@@ -71,24 +72,44 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          java-version: 'openjdk11'
+          jre: '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},
+              aaa-maven-merge-{stream},
+              bgpcep-maven-merge-{stream},
+              controller-maven-merge-{stream},
+              daexim-maven-merge-{stream},
+              genius-maven-merge-{stream},
+              infrautils-maven-merge-{stream},
+              jsonrpc-maven-merge-{stream},
+              lispflowmapping-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},
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
+          jre: 'openjdk11'
+          dependencies: >
+              aaa-maven-merge-{stream},
+              bgpcep-maven-merge-{stream},
+              controller-maven-merge-{stream},
+              daexim-maven-merge-{stream},
+              genius-maven-merge-{stream},
+              infrautils-maven-merge-{stream},
+              jsonrpc-maven-merge-{stream},
+              lispflowmapping-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: >
@@ -100,7 +121,6 @@
               genius-merge-{stream},
               infrautils-merge-{stream},
               lispflowmapping-merge-{stream},
-              mdsal-merge-{stream},
               netconf-merge-{stream},
               netvirt-merge-{stream}
               neutron-merge-{stream},
@@ -119,26 +139,6 @@
               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: >
-              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},
@@ -159,7 +159,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'
@@ -168,24 +168,26 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-      - sodium:
-          branch: 'stable/sodium'
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-      - neon:
-          branch: 'stable/neon'
+      - sodium:
+          branch: 'stable/sodium'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
               transportpce-merge-{stream}
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
@@ -202,21 +204,23 @@
     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:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
 
 - project:
     name: distribution-sonar
@@ -226,9 +230,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