From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Tue, 2 Feb 2016 16:27:57 +0000 (+0900)
Subject: docs: fix jobs for yardstick doc builder
X-Git-Tag: brahmaputra.1.0~78
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=4e128a70446df7b14310f5d2fd03614ca8fff593

docs: fix jobs for yardstick doc builder

Change-Id: I8accb7e58c273a728cb05f0414f677b2637e46d3
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
---

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 426557a0a..bfe343f4f 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -70,9 +70,9 @@
             easy_install -U setuptools
             python setup.py develop
             ./run_tests.sh
-            deactivate
         - generate-api-docs-for-yardstick
         - upload-review-docs
+        - shell: 'deactivate'
 
 - job-template:
     name: 'yardstick-merge-{stream}'
@@ -120,9 +120,9 @@
             easy_install -U setuptools
             python setup.py develop
             ./run_tests.sh
-            deactivate
         - generate-api-docs-for-yardstick
         - upload-merged-docs
+        - shell: 'deactivate'
 
 ################################
 # job builders
@@ -136,6 +136,4 @@
             set -o errexit
             set -o pipefail
 
-            source $WORKSPACE/yardstick_venv/bin/activate
             sphinx-apidoc -o docs/apidocs yardstick
-            deactivate