LISP: Complete Lithium and Beryllium test separation

See https://git.opendaylight.org/gerrit/#/c/31304/

Change-Id: Ib7668f8f3ec4d80de885d2b81ccd07c1cab600ca
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
index 6522eb9216eb75d820243b173bb971445aefa9f4..7ab459a32e8aa051ed2ecdf908f46257299b6f75 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
@@ -24,7 +24,7 @@
     install-features: 'odl-lispflowmapping-all,odl-restconf,odl-mdsal-apidocs'
 
     # Robot custom options
-    robot-options: '-v ODL_VERSION:Li'
+    robot-options: ''
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},neutron-distribution-{stream},lispflowmapping-distribution-{stream}'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index b60d0233c1d00b41c21e5e2c9f5868763b507f00..985c1e2300a8ea9c75ebbb9e1e595c4a09f28963 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: lispflowmapping-csit-all
+    name: lispflowmapping-csit-msmr
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-1node-{functionality}'
@@ -8,7 +8,7 @@
     project: 'lispflowmapping'
 
     # The functionality under test
-    functionality: 'all'
+    functionality: 'msmr'
 
     # Project branches
     stream: