Merge "Add support for jdk11 in magnesium"

[releng/builder.git] / jjb / integration / distribution / distribution-jobs.yaml

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 3f7646034f2741660a9a36e5f837b208523d89e6..356241a779ba2b3dd06f98dbfe8e4c20ad9c3630 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -16,19 +16,25 @@
     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:
-      - sodium:
+      - 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
+              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
       - neon:
           branch: 'stable/neon'
           karaf-version: odl
@@ -64,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'
@@ -73,8 +79,27 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - sodium:
+      - 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},
@@ -143,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'
@@ -152,12 +177,18 @@
     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}
+      - sodium:
+          branch: 'stable/sodium'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              transportpce-merge-{stream}
       - neon:
           branch: 'stable/neon'
           karaf-version: odl
@@ -176,26 +207,26 @@
     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-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'
 
@@ -209,7 +240,7 @@
     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'
 
 - project:
     name: distribution-view