From 645d34fe0f36153799ca8fd788da4a4e164d88c8 Mon Sep 17 00:00:00 2001
From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Wed, 3 Feb 2016 08:56:21 +0900
Subject: [PATCH] docs: fix yardstick docs builder

Change-Id: I7b3e08a8f5950515bfd0d8e94948f71d395aec7b
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
---
 jjb/yardstick/yardstick-project-jobs.yml | 52 ++++++++++++++------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index bfe343f4f..91138e504 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -58,21 +58,9 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o pipefail
-
-            echo "Running unit tests..."
-            cd $WORKSPACE
-            virtualenv $WORKSPACE/yardstick_venv
-            source $WORKSPACE/yardstick_venv/bin/activate
-            easy_install -U setuptools
-            python setup.py develop
-            ./run_tests.sh
-        - generate-api-docs-for-yardstick
-        - upload-review-docs
-        - shell: 'deactivate'
+        - yardstick-unit-tests-and-docs-build
+        - upload-under-review-docs-to-opnfv-artifacts
+        - report-docs-build-result-to-gerrit
 
 - job-template:
     name: 'yardstick-merge-{stream}'
@@ -107,6 +95,18 @@
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
 
+    builders:
+        - yardstick-unit-tests-and-docs-build
+        - upload-generated-docs-to-opnfv-artifacts
+        - report-docs-build-result-to-gerrit
+        - remove-old-docs-from-opnfv-artifacts
+
+################################
+# job builders
+################################
+
+- builder:
+    name: yardstick-unit-tests-and-docs-build
     builders:
         - shell: |
             #!/bin/bash
@@ -119,21 +119,15 @@
             source $WORKSPACE/yardstick_venv/bin/activate
             easy_install -U setuptools
             python setup.py develop
+
+            # unit tests
             ./run_tests.sh
-        - generate-api-docs-for-yardstick
-        - upload-merged-docs
-        - shell: 'deactivate'
 
-################################
-# job builders
-################################
+            # generate api doc sources
+            sphinx-apidoc -o docs/apidocs yardstick
 
-- builder:
-    name: generate-api-docs-for-yardstick
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o pipefail
+            # build docs
+            git clone ssh://gerrit.opnfv.org:29418/releng
+            GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh
 
-            sphinx-apidoc -o docs/apidocs yardstick
+            deactivate
-- 
2.16.6