X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-project-jobs.yml;h=f32816495d4acf9904c8511ad4b6607fe4d8bb41;hb=1747abe94b466883e5d5f04745a81a433b01f335;hp=c6f3173863a73cff05a27ddbf1d695232ac4d03f;hpb=170bc3ae2cfa396c6a48b09dd91d0769e7749280;p=releng.git

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index c6f317386..f32816495 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -15,9 +15,11 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-        - brahmaputra:
+            disabled: false
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
+            disabled: false
 
 ################################
 # job templates
@@ -26,21 +28,21 @@
 - job-template:
     name: 'yardstick-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -59,31 +61,29 @@
                     branch-pattern: '**/{branch}'
     builders:
         - 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}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-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:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -97,9 +97,6 @@
 
     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
@@ -119,21 +116,13 @@
             source $WORKSPACE/yardstick_venv/bin/activate
 
             # install python packages
-            easy_install -U setuptools
+            sudo apt-get install -y build-essential python-dev python-pip python-pkg-resources
+            easy_install -U setuptools==33.1.1
             easy_install -U pip
-            pip install -r tests/ci/requirements.txt
+            pip install -r requirements.txt || 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