Add missing magnesium jobs

Change-Id: I069dfa6a4b3c67a4016c76d970bae63b3b6f9ad2
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index b2bb7a3b5e4e71baeffa3907331594e539654744..04b1d491fbf44b30e6007cf2afc446b055c7d765 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -179,6 +179,9 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-sanity-list-magnesium: >
+        openflowplugin-csit-1node-sanity-only-magnesium,
+        distribution-sanity-magnesium
     csit-sanity-list-sodium: >
         openflowplugin-csit-1node-sanity-only-sodium,
         distribution-sanity-sodium
@@ -188,6 +191,15 @@
     csit-sanity-list-fluorine: >
         openflowplugin-csit-1node-sanity-only-fluorine,
         distribution-sanity-fluorine
+    csit-weekly-list-magnesium: >
+        controller-csit-1node-notifications-longevity-only-magnesium,
+        controller-csit-3node-drb-partnheal-longevity-only-magnesium,
+        controller-csit-3node-drb-precedence-longevity-only-magnesium,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-magnesium,
+        bgpcep-csit-3node-bgpclustering-longevity-only-magnesium,
+        distribution-deploy-magnesium,
+        distribution-offline-magnesium,
+        openflowplugin-csit-1node-longevity-only-magnesium
     csit-weekly-list-sodium: >
         controller-csit-1node-notifications-longevity-only-sodium,
         controller-csit-3node-drb-partnheal-longevity-only-sodium,

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 510197c60231dd04573906c6fc10e794d9d9ba2a..0839c2951e719a15ad50826898b49356f4e7e832 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -23,16 +23,10 @@
     stream:
       - magnesium:
           branch: 'master'
+          karaf-version: odl
       - sodium:
           branch: 'stable/sodium'
           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
       - neon:
           branch: 'stable/neon'
           karaf-version: odl
@@ -81,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},
@@ -160,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
@@ -199,12 +215,12 @@
     staging-profile-id: 2af042ed81d5e2
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
-
+      - sodium:
+          branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
-
       - fluorine:
           branch: 'stable/fluorine'
 

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 906469ea333719b28ea22bdd88ade2925c477053..07b29952b1bdb1670b3a7a5c6ed6142b3ca9b291 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -65,8 +65,20 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
+          csit-blacklist: >
+              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
+              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              gate longevity sanity tdd tempest wip
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+              netvirt-csit-3node-1cmb
+              last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+          csit-list: !include: csit-jobs-magnesium.lst
+          csit-weekly-list: '{csit-weekly-list-magnesium}'
+      - sodium:
+          branch: 'stable/sodium'
           csit-blacklist: >
               alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
               of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
@@ -110,9 +122,13 @@
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-magnesium}'
+      - sodium:
+          branch: 'stable/sodium'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-sodium}'
       - neon:
           branch: 'stable/neon'