Fix for VTN CSIT verify job

* Add ubuntu image 2.5.0 as generic for vtn verify job, vtn CSIT boron
  and carbon
* Add default ubuntu image 2.0 for VTN beryllium CSIT job.

Change-Id: Ie561f9a3a3004cd0ac10749dda88ec7e2f798925
Signed-off-by: Karthik.S <siva-karthik@hcl.com>

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index 1e78e755ccade34c9ae1735fd2ef00e230268e3d..3cceeab231fc6f44d6a326493918d5721f714a36 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -15,14 +15,13 @@
         - carbon:
             branch: 'master'
             jre: 'openjdk8'
-            mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
-            mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
+            mininet-image: 'ubuntu-trusty-mininet-2c-2g'
 
     install:
         - only:
@@ -36,6 +35,7 @@
     # Robot custom options
     robot-options: ''
 
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'