Revert "Fix default mininet image name"

This reverts commit 671c7f131175e352b227021ecb851c3936857297.

Change-Id: I4004b16ae5836a721a1d6b3151f3e44530eed723
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 4f61ee1a9ab1ad10ff9c138d56471c7df83e7605..80b4a14462cba0642ea1d7ba4c1111b5cbe342eb 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -34,7 +34,7 @@
     openstack_system_image: CentOS 7 - devstack - 20170120-1710
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
+    tools_system_image: Ubuntu 14.04 - mininet - 20170130-0425
 
     # Default Robot framework options
     robot-options: ''

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index ea897dcc054550be5f1001162e2858d2493097db..829aa69300fb06dd34ec797350b817f0b37ecb7c 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -21,7 +21,7 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-            # TODO: Is less than 2.5 needed here?
+            tools_system_image: Ubuntu 14.04 - mininet - 20170130-0425
 
     install:
         - only: