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

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 772ba0750..32314b263 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -21,12 +21,18 @@
     nexus-iq-stage: release
     email-upstream: '[int/dist]'
     stream:
-      - aluminium:
+      - 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:
@@ -39,16 +45,6 @@
               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
 
 - project:
     name: distribution-managed
@@ -72,17 +68,32 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           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},
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
+          jre: 'openjdk11'
+          dependencies: >
+              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},
@@ -128,24 +139,6 @@
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
-      - neon:
-          branch: 'stable/neon'
-          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},
-              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
@@ -168,12 +161,18 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - aluminium:
+      - silicon:
           branch: 'master'
           java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
       - magnesium:
           branch: 'stable/magnesium'
           java-version: 'openjdk11'
@@ -186,12 +185,6 @@
           dependencies: >
               distribution-merge-managed-{stream},
               transportpce-merge-{stream}
-      - neon:
-          branch: 'stable/neon'
-          karaf-version: odl
-          dependencies: >
-              distribution-merge-managed-{stream},
-              transportpce-merge-{stream}
 
 - project:
     name: distribution-release
@@ -211,16 +204,17 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - aluminium:
+      - 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'
 
 - project:
     name: distribution-sonar
@@ -234,6 +228,10 @@
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     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