Add missing magnesium jobs

[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 e16edb39e3e6708dcd3b3df64f719a0a0384b35f..0839c2951e719a15ad50826898b49356f4e7e832 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -21,16 +21,12 @@
     nexus-iq-stage: release
     email-upstream: '[int/dist]'
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
           karaf-version: odl
-          # Self-Managed projects repos and features:
-          sm-repos: >
-              mvn:org.opendaylight.telemetry/features-telemetry//xml/features
-          sm-features: >
-              odl-telemetry-collector,
-              odl-telemetry-configurator,
-              odl-telemetry-all
+      - sodium:
+          branch: 'stable/sodium'
+          karaf-version: odl
       - neon:
           branch: 'stable/neon'
           karaf-version: odl
@@ -79,8 +75,26 @@
     dist-pom: 'distribution/pom.xml'
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
+          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},
@@ -158,12 +172,16 @@
     dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              telemetry-merge-{stream}
+      - sodium:
+          branch: 'stable/sodium'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
       - neon:
           branch: 'stable/neon'
           karaf-version: odl
@@ -197,12 +215,12 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
-
+      - sodium:
+          branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-
       - fluorine:
           branch: 'stable/fluorine'