Update Cbench tests to use mininet-ubuntu

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
index f26fc22506edd55e5f461ae04f160503a8dcadfe..667e8436feaf7877419a68820d3d345fc3e4f4ae 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
@@ -22,9 +22,6 @@
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-drop-test-he'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-
     # Robot custom options
     robot-options: '-v duration_in_secs:180'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
index 8a91c74e0b0f4e2e4ec833d96e5cc80781b4618a..5bac31ee356402ed73f83c95a302a1fc9ab61ed3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
@@ -25,9 +25,6 @@
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-drop-test-li'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-
     # Robot custom options
     robot-options: '-v duration_in_secs:180'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
index f645055e3ffe9a6010e8bb2ee05b6785853f7cfb..f2c3cfea4be22ed8d0edc5035bd4a0a2cd1eaacb 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
@@ -25,9 +25,6 @@
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-
     # Robot custom options
     robot-options: '-v duration_in_secs:180'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index 2b2fa052a06f096e06faa1273319f68d997c30e1..9ceba23d0744a94ea0e4b5bd38fbec490a1c2e19 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -22,9 +22,6 @@
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-
     # Robot custom options
     robot-options: '-v duration_in_secs:180'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
index ad37b99469cd89b1a9125d341e7db055111c99e4..4688fe629700979f00735ab409f4a863bd630790 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
@@ -22,9 +22,6 @@
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-drop-test-he'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-
     # Robot custom options
     robot-options: ''
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
index 2d00ad51dc4c392bb132efe79aacd1fb067866f5..f4782b4af4bf585c226fb976511afd9b049a5be0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
@@ -25,9 +25,6 @@
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-drop-test-li'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-
     # Robot custom options
     robot-options: ''
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
index bd095050c8722510e6806d78684bd3bed221a0f8..365ed21932b19e5a9755bf0aac1327caf39f49ea 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
@@ -25,9 +25,6 @@
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-
     # Robot custom options
     robot-options: ''
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index 66f98016991180f09b0bd3f2f49ea602c28d0dfa..88f52246e6ba015685f4b2043074a80bfa91c441 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
@@ -22,9 +22,6 @@
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-
     # Robot custom options
     robot-options: ''