From 382b9a9d05ab70ff995a7f862089e0a5f911fbf9 Mon Sep 17 00:00:00 2001
From: Radek Zetik <radekx.zetik@intel.com>
Date: Tue, 22 Dec 2015 09:05:35 +0000
Subject: [PATCH] CI: Modify jjb in releng to use vsperf build script for the
 nightly build

This patch removes calling of scl and vsperf from 'verify'
and 'merge' jobs. The reason is that both jobs are started
on 'opnfv-build' and environment on all boards is not
set to run the vsperf.

JIRA: VSPERF-156

Signed-off-by: Radek Zetik <radekx.zetik@intel.com>
Reviewed-by: Aric Gardner <agardner@linuxfoundation.org>
Reviewed-by: Xinyu Zhao(Jerry) <zhaoxinyu@huawei.com>
Reviewed-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Reviewed-by: Ulrich Kleber <Ulrich.Kleber@huawei.com>
Reviewed-by: Billy O Mahony <billy.o.mahony@intel.com>
---
 jjb/vswitchperf/vswitchperf.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 39803aa45..3344e187e 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -105,10 +105,6 @@
             make
             # run basic sanity test
             make sanity
-            scl enable python33 bash
-            source ~/vsperfenv/bin/activate
-            cd ../ci
-            ./build-vsperf.sh verify
 
 - job-template:
     name: 'vswitchperf-merge-{stream}'
@@ -158,7 +154,3 @@
             cd src
             make clobber
             make
-            scl enable python33 bash
-            source ~/vsperfenv/bin/activate
-            cd ../ci
-            ./build-vsperf.sh merge
-- 
2.16.6