X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-jobs.yaml;h=ed0ef380cc1ae38baeea7f50afba36f49f201068;hb=bcc48f4daaa330a4a55921858c243e148daab8d0;hp=93b2925fe7a4bbda855e3ad70de6f399f093bbd7;hpb=9319e02772bba40e23bca708918c482503fe9ae1;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 93b2925fe..ed0ef380c 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -39,16 +39,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,7 +62,7 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           java-version: 'openjdk11'
           jre: 'openjdk11'
@@ -91,6 +81,25 @@
               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: >
@@ -109,24 +118,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
@@ -149,20 +140,20 @@
     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},
-              transportpce-merge-{stream}
-      - neon:
-          branch: 'stable/neon'
+      - sodium:
+          branch: 'stable/sodium'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
@@ -186,13 +177,14 @@
     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'
 
 - project:
     name: distribution-sonar