Update OFP mininet VM to OVS 2.6

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 3ece1e1fcb6edc5c2cc462d5f7b742ab5207e1a9..e098a9845e2788c6961d5cfc74c672bc30731ee3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -18,15 +18,16 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
     # Job images
-    odl_system_flavor: v1-performance-4
-    tools_system_flavor: v1-performance-2
+    odl_system_flavor: 'v1-performance-4'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+    tools_system_flavor: 'v1-performance-2'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 55d2a23e37662e87c74e801d814d67b03c6897b7..4b09a8a0da89da3ed71aaf4f2e2a0405e677c7e8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -20,12 +20,15 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic'
 

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 56ccf5ac0058043404162e190bdb981053cce7f1..3c8aa03537f84cc360b032ae3905ba90671d877e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -20,7 +20,7 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
@@ -28,7 +28,7 @@
 
     # Job images
     odl_system_flavor: 'v1-performance-4'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index c7d56675a85bf0ada4d0b3ed8aaa21d24c2f86d5..b14b2d07ad51c78bb55e6be8227fc6f96e8175be 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -20,17 +20,17 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-table-miss-enforcer'
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium'
-
-    # mininet image
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 22f8992801e09bfcd0b9ece74a8120787600f920..ffbfa0fc0864500aa9ca55e91668d9e4a51efbf3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -20,12 +20,15 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - all:
           scope: 'all'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
@@ -34,6 +37,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 622030d3e3532b8bee5193d274ba04c4570ed8f6..9cdddc543add1206d93c676a4d7afe373ce05e6c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -19,12 +19,15 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
@@ -34,8 +37,3 @@
 
     # Robot custom options
     robot-options: '-v TEST_LENGTH:23h'
-
-    # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
-
-    schedule: '{schedule-saturday}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index a1d794cdf52f10d2f11aad47e946c8581f01da03..1c913d8444ff1c91cceade3a6c881d8c05ace5c2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -20,15 +20,15 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
     # Job images
-    odl_system_flavor: v1-performance-4
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
+    odl_system_flavor: 'v1-performance-4'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index e1753bfde69e4e10dfe8393eab2068c0046c2532..b1eb7dada72f187b249af15357fb5df2bf945c77 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -20,7 +20,7 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
@@ -28,7 +28,7 @@
 
     # Job images
     odl_system_flavor: 'v1-performance-4'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 35bf7382497e88a580186c637d8f070f39bec450..d9f0d34a64109efc582695a5e67a095b1fc23184 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -19,12 +19,15 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
@@ -33,6 +36,3 @@
 
     # Robot custom options
     robot-options: '-v SWITCHES:3'
-
-    # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 6ce8b4535cc32a95538dd9660f3e6ff0685a7f56..8f2ed52f4819729c72cf7f421c72e931c8152ea2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -18,12 +18,15 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
@@ -34,9 +37,6 @@
     # Robot custom options
     robot-options: ''
 
-    # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
-
     # Plot Info
     01-plot-title: 'Maximum Links Full Mesh Topology'
     01-plot-yaxis: 'Links'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 55047f18aea0a92f4199b8134c2835338a4bb227..e7ae4f40ba56b8d2610660e72a2083661890fc59 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -18,12 +18,15 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
@@ -33,9 +36,6 @@
     # Robot custom options
     robot-options: ''
 
-    # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
-
     # Plot Info
     01-plot-title: 'Maximum Switches Linear Topology'
     01-plot-yaxis: 'Switches'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 0852dc9ed13df4cdff28e03853911bedf927e531..dc36c678b3e70c4ef806b901b2a939c1a8ef0927 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -20,14 +20,15 @@
           branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
     # Job images
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: 'v1-performance-4'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 67c0675badafd98a38d3f303c07b764f36cf5933..184a2ae1272c04fa3746a2ec759294b22d58ba81 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -18,7 +18,7 @@
       - carbon:
           branch: 'stable/carbon'
           os-branch: 'ocata'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     jdk: 'openjdk8'
 

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 2ac3aedb7a177f6ddde59b04a79dfeec4ac6d7fb..166a55f31c90d61758d7b46ae62f993b6cd5b916 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -77,7 +77,7 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/carbon'
-    karaf-version: karaf3
+    karaf-version: 'karaf3'
     jdks:
       - openjdk8
     maven: