From: gvrangan <venkatrangang@hcl.com>
Date: Tue, 18 Oct 2016 23:31:49 +0000 (+0000)
Subject: Fix for VTN Jobs Failure in Beryllium
X-Git-Tag: release/beryllium-sr4~7
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c09451b068207070f242296f0041619170a46911;p=releng%2Fbuilder.git

Fix for VTN Jobs Failure in Beryllium

The OVS version 2.5 is causing some issues
so reverted to the old mininet for Beryllium

Change-Id: Ic619cfe98ae05c99bbec3ec5c55487482d5a0335
Signed-off-by: gvrangan <venkatrangang@hcl.com>
---

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index f1480d61c..32c927e7a 100644
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -15,9 +15,11 @@
         - 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'
@@ -33,7 +35,6 @@
     # 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}'
diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index 526f35e07..1e78e755c 100644
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -15,9 +15,11 @@
         - 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'
@@ -34,7 +36,6 @@
     # 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}'