X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Fyardstick%2Fyardstick-project-jobs.yml;h=48c9d9d5697513ee637d0e8dc6074ecf99b06846;hb=b2bc05dad00f551cdcaa10c4f3864adc67639dbf;hp=f8f1abbff476f1ae1d222ac66969a19dc1315629;hpb=51ac194b32f72254a09296677f98bf55766b0521;p=releng.git

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index f8f1abbff..48c9d9d56 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
+        - colorado:
             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
@@ -120,18 +117,11 @@
 
             # install python packages
             easy_install -U setuptools
-            python setup.py develop
+            easy_install -U pip
+            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