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

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 4f978e189..c6f317386 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -31,7 +31,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-ca-build-1-defaults'
+        - 'ericsson-build-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -58,19 +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
+        - 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}'
@@ -80,7 +70,11 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-ca-build-1-defaults'
+        - 'ericsson-build-defaults'
+        - string:
+            name: GS_URL
+            default: '$GS_BASE{gs-pathname}'
+            description: "Directory where the build artifact will be located upon the completion     of the build."
 
     scm:
         - gerrit-trigger-scm:
@@ -101,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
@@ -111,7 +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
+            easy_install -U pip
+            pip install -r tests/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