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

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index d62784592..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:
@@ -62,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},
@@ -140,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'
@@ -177,9 +204,12 @@
     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'