Run new MDSAL CSIT to the weekly MRI test

Also change multipatch build order:
infrautils only needs to build if odlparent version changes.

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 7f8d96736f63872de0f26844b185c4b883b304de..4f440af00aa22190d75dca0703790a750db53250 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -202,6 +202,7 @@
       controller-csit-3node-clustering-tell-all-silicon,
       controller-csit-3node-rest-clust-cars-perf-ask-only-silicon,
       controller-csit-3node-rest-clust-cars-perf-tell-only-silicon,
+      mdsal-csit-3node-netty-replicate-only-silicon,
       yangtools-csit-1node-system-only-silicon
     csit-mri-list-aluminium: >
       controller-csit-1node-akka1-all-aluminium,
@@ -212,8 +213,10 @@
       controller-csit-3node-clustering-tell-all-aluminium,
       controller-csit-3node-rest-clust-cars-perf-ask-only-aluminium,
       controller-csit-3node-rest-clust-cars-perf-tell-only-aluminium,
+      mdsal-csit-3node-netty-replicate-only-aluminium,
       yangtools-csit-1node-system-only-aluminium
     csit-mri-list-magnesium: >
+      mdsal-csit-3node-netty-replicate-only-magnesium,
       yangtools-csit-1node-system-only-magnesium
     csit-sanity-list-silicon: >
       openflowplugin-csit-1node-sanity-only-silicon,

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index fad6965ba29dcb3224cf8237747436bf86c92d7b..682ac76f92bfafa6714c6577b5e5a1af531619e5 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -25,7 +25,7 @@
           java-version: "openjdk11"
           csit-list: !include: csit-jobs-silicon.lst
           build-order: >
-            odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
+            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
             daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping
             bgpcep integration/distribution
 
@@ -35,7 +35,7 @@
           java-version: "openjdk11"
           csit-list: !include: csit-jobs-aluminium.lst
           build-order: >
-            odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
+            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
             daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
             bgpcep integration/distribution
 
@@ -45,7 +45,7 @@
           java-version: "openjdk11"
           csit-list: !include: csit-jobs-magnesium.lst
           build-order: >
-            odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
+            odlparent infrautils yangtools mdsal controller serviceutils aaa netconf
             daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
             bgpcep integration/distribution