X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-project-jobs.yml;h=c6f3173863a73cff05a27ddbf1d695232ac4d03f;hb=b65b34f10e52dbb445b5c2654c67cf9d9a218ecd;hp=bfe343f4fe4c3c91ff48f0d94db8c375e73f3e7b;hpb=4e128a70446df7b14310f5d2fd03614ca8fff593;p=releng.git

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index bfe343f4f..c6f317386 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
@@ -117,23 +117,23 @@
             cd $WORKSPACE
             virtualenv $WORKSPACE/yardstick_venv
             source $WORKSPACE/yardstick_venv/bin/activate
+
+            # install python packages
             easy_install -U setuptools
-            python setup.py develop
-            ./run_tests.sh
-        - generate-api-docs-for-yardstick
-        - upload-merged-docs
-        - shell: 'deactivate'
+            easy_install -U pip
+            pip install -r tests/ci/requirements.txt
+            pip install -e .
 
-################################
-# job builders
-################################
+            # unit tests
+            ./run_tests.sh
 
-- builder:
-    name: generate-api-docs-for-yardstick
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o pipefail
+            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