merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

[releng.git] / jjb / yardstick / yardstick-project-jobs.yml

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 426557a..4b7ff6f 100644 (file)
--- 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,20 @@
 - 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'
@@ -58,44 +59,29 @@
                   - 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
 
 - 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:
@@ -108,34 +94,33 @@
                       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
 
 ################################
 # 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
-            sphinx-apidoc -o docs/apidocs yardstick
+
+            # install python packages
+            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 requirements.txt || pip install -r tests/ci/requirements.txt
+            pip install -e .
+
+            # unit tests
+            ./run_tests.sh
+
             deactivate