X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=32314b263266c9c44b440000563b138798d7fb53;hb=e1cc5b83666733a7cdc47bb3f42b75cd7a7c8f9e;hp=b534f7f3e52c64cb7d82d02a22c2142c83b55f40;hpb=1619783bc8522e6f2a336306e213e6d768bf1bd4;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index b534f7f3e..32314b263 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -16,20 +16,28 @@
     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:
+      - silicon:
           branch: 'master'
+          java-version: openjdk11
+          jre: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: openjdk11
+          jre: 'openjdk11'
+          karaf-version: odl
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: openjdk11
+          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,17 +45,6 @@
               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
@@ -62,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'
@@ -71,64 +68,61 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - magnesium:
+      - silicon:
           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},
-      - sodium:
-          branch: 'stable/sodium'
+              aaa-maven-merge-{stream},
+              bgpcep-maven-merge-{stream},
+              daexim-maven-merge-{stream},
+              genius-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},
+      - aluminium:
+          branch: 'stable/aluminium'
+          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},
-              sfc-merge-{stream}
-      - neon:
-          branch: 'stable/neon'
+              aaa-maven-merge-{stream},
+              bgpcep-maven-merge-{stream},
+              daexim-maven-merge-{stream},
+              genius-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-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}
-      - fluorine:
-          branch: 'stable/fluorine'
+              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: >
               aaa-merge-{stream},
               bgpcep-merge-{stream},
@@ -138,7 +132,6 @@
               genius-merge-{stream},
               infrautils-merge-{stream},
               lispflowmapping-merge-{stream},
-              mdsal-merge-{stream},
               netconf-merge-{stream},
               netvirt-merge-{stream}
               neutron-merge-{stream},
@@ -159,7 +152,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 +161,26 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - magnesium:
+      - silicon:
           branch: 'master'
+          java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-      - sodium:
-          branch: 'stable/sodium'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-      - neon:
-          branch: 'stable/neon'
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              transportpce-merge-{stream}
-      - fluorine:
-          branch: 'stable/fluorine'
+      - sodium:
+          branch: 'stable/sodium'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
@@ -196,26 +191,30 @@
     jobs:
       - 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:
-      - magnesium:
+      - silicon:
           branch: 'master'
+          java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          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
@@ -225,9 +224,14 @@
     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'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: distribution-view