Merge "First step for Ubuntu mininet migration"

diff --git a/jjb/controller/controller-csit-netconf-stable-helium.yaml b/jjb/controller/controller-csit-netconf-stable-helium.yaml
index eaf3f6ef88bbc8ec66286c83dd225d0e5d55b61c..d2d792937ae853a4476b39184e4137e0de92b6a7 100644 (file)
--- a/jjb/controller/controller-csit-netconf-stable-helium.yaml
+++ b/jjb/controller/controller-csit-netconf-stable-helium.yaml
@@ -21,6 +21,9 @@
         - all:
             scope: 'all'
 
+    # Mininet configuration, this is needed as netopeer is only available in this vm
+    mininet-image: 'rk-c-el6-mininet'
+
     # Features to install
     install-features: 'odl-netconf-connector-all,odl-restconf-all'
 

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index 0e169093f3c879213c294585a836733ffbfe670d..f4140dfd94bcd1b737a1fb65a2b055e930f53836 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -23,10 +23,6 @@
         - all:
             scope: 'all'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
-
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
 

diff --git a/jjb/integration/integration-csit-basic.yaml b/jjb/integration/integration-csit-basic.yaml
index 8dcf589f20599e4ef12d0a621948a597e1661490..c4ed20c51d51899491fc81df20eb08ed1f34c3c7 100644 (file)
--- a/jjb/integration/integration-csit-basic.yaml
+++ b/jjb/integration/integration-csit-basic.yaml
@@ -25,10 +25,6 @@
         - all:
             scope: 'all'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
-
     # Features to install
     install-features: 'odl-restconf'
 

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index ec87dcf5ce5b1b882e5196d95ed68f64e2dbe36f..580649485edb97f19dc2cb8250a2a26f271b9370 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -23,9 +23,8 @@
         - all:
             scope: 'all'
 
-    # Tools system configuration (formerly "mininet configuration")
+    # Tools system configuration (formerly "mininet configuration"), this is needed as netopeer is only available in this vm
     mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
 
     # Features to install
     install-features: 'odl-restconf,odl-netconf-mdsal,odl-netconf-connector-all'

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 29f0cf0dffbfb87edafad9739f20934d6e482d62..1d7b48290e2a30fd7ba0dbe304c34397184b7cab 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -23,10 +23,6 @@
         - all:
             scope: 'all'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
-
     # Features to install
     install-features: 'odl-nic-core,odl-nic-console,odl-nic-renderer-vtn,odl-nic-renderer-gbp'
 

diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index 5897adf55da6a6221ed18f9646b8fbc3c46705e4..a437bacd0a8d9544aa9fd5d8b732f61c6e7349b6 100644 (file)
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -21,10 +21,6 @@
         - all:
             scope: 'all'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
-
     # Features to install
     install-features: 'odl-nic-core,odl-nic-console,odl-nic-renderer-vtn'
 

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index b1f5f3c19ad32b4f8d4429c5c566a72f97981676..ffdbe0b8e6fc4585c02c7fabadaa8ef351e4ca59 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -23,7 +23,6 @@
             scope: 'all'
 
     # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
     mininet-vms: 2
 
     # Features to install