X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-project-jobs.yml;h=f06bf707776a55ada4dbd6f8a8c99693adcb5999;hb=04fea4722f67ea665cd1122736e3fb4152336138;hp=426557a0ac58688b3457ee74e936268d78dad4c6;hpb=bdcbaf0afc5d704eb9d3099f83eb7ebcfa6582ff;p=releng.git

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 426557a0a..f06bf7077 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
-            deactivate
-        - generate-api-docs-for-yardstick
-        - upload-review-docs
+        - 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}'
@@ -108,34 +96,44 @@
                       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
-            deactivate
-        - generate-api-docs-for-yardstick
-        - upload-merged-docs
+        - 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: generate-api-docs-for-yardstick
+    name: yardstick-unit-tests-and-docs-build
     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
+
+            # install python packages
+            easy_install -U setuptools
+            easy_install -U pip
+            pip install -r ci/requirements.txt
+            pip install -e .
+
+            # unit tests
+            ./run_tests.sh
+
+            pip install Sphinx==1.3.1 doc8 docutils sphinxcontrib-httpdomain
+
+            # generate api doc sources
             sphinx-apidoc -o docs/apidocs yardstick
+
+            # build docs
+            git clone ssh://gerrit.opnfv.org:29418/releng
+            GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh
+
             deactivate