diff options
Diffstat (limited to 'jjb/yardstick')
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 55 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 60 |
2 files changed, 76 insertions, 39 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 8a5546d80..9566651ff 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -13,10 +13,12 @@ stream: master branch: '{stream}' gs-pathname: '' + docker-tag: 'latest' brahmaputra: &brahmaputra stream: brahmaputra branch: 'stable/{stream}' gs-pathname: '{stream}' + docker-tag: 'brahmaputra.1.0' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- @@ -38,6 +40,11 @@ suite: daily auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra + - orange-pod2: + installer: joid + suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *brahmaputra - huawei-us-deploy-bare-1: installer: compass suite: daily @@ -71,6 +78,11 @@ #-------------------------------- # master #-------------------------------- + - opnfv-jump-2: + installer: fuel + suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *master - ericsson-pod1: installer: fuel suite: daily @@ -121,6 +133,11 @@ suite: daily auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master + - huawei-sh-test-2: + installer: compass + suite: daily + auto-trigger-name: 'yardstick-daily-huawei-sh-test-2-trigger' + <<: *master - virtual: installer: joid suite: daily @@ -149,6 +166,9 @@ wrappers: - build-name: name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 180 + abort: true triggers: - '{auto-trigger-name}' @@ -163,6 +183,10 @@ name: DEPLOY_SCENARIO default: 'os-odl_l2-nofeature-ha' - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: 'Tag to pull docker image' + - string: name: YARDSTICK_SUITE_NAME default: opnfv_${{NODE_NAME}}_{suite}.yaml description: 'Path to test suite' @@ -224,7 +248,7 @@ -e YARDSTICK_BRANCH=${GIT_BRANCH##origin/} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}" # Pull the latest image - docker pull opnfv/yardstick >$redirect + docker pull opnfv/yardstick:$DOCKER_TAG >$redirect # Run docker cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \ @@ -285,7 +309,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -293,7 +317,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -309,7 +333,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 10.118.36.90:8086' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -317,7 +341,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 10.118.36.90:8086' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -325,7 +349,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-r 213.77.62.197/results' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -333,7 +357,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-r 213.77.62.197/results' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -341,7 +365,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -357,7 +381,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -376,6 +400,14 @@ default: '' description: 'Arguments to use in order to choose the backend DB' +- parameter: + name: 'yardstick-params-huawei-sh-test-2' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '' + description: 'Arguments to use in order to choose the backend DB' + ####################### ## trigger macros ####################### @@ -389,3 +421,8 @@ name: 'yardstick-vtcdaily-ericsson-pod1-trigger' triggers: - timed: '0 1 * * *' + +- trigger: + name: 'yardstick-daily-huawei-sh-test-2-trigger' + triggers: + - timed: '0 1 * * *' diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index bfe343f4f..f06bf7077 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}' @@ -108,6 +96,18 @@ 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 set -o errexit @@ -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 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 |