diff options
Diffstat (limited to 'jjb/yardstick')
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 103 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 50 |
2 files changed, 81 insertions, 72 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 21b6691b7..e7221e70c 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -26,81 +26,110 @@ - opnfv-jump-1: installer: apex suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - opnfv-jump-2: installer: fuel suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - intel-pod5: installer: joid suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - huawei-us-deploy-bare-1: installer: compass suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - ericsson-pod1: installer: fuel suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *brahmaputra + - ericsson-pod2: + installer: fuel + suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - virtual: installer: fuel suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - huawei-virtual: installer: compass suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - virtual: installer: joid suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra #-------------------------------- # master #-------------------------------- + - opnfv-jump-2: + installer: fuel + suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *master - ericsson-pod1: installer: fuel suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master - ericsson-pod1: installer: fuel suite: vtcdaily + auto-trigger-name: 'yardstick-vtcdaily-ericsson-pod1-trigger' <<: *master - ericsson-pod2: installer: fuel suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master - intel-pod6: installer: joid suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master - intel-pod8: installer: compass suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master - zte-build-1: installer: fuel suite: daily + auto-trigger-name: 'yardstick-daily-zte-build-1-trigger' <<: *master - orange-pod2: installer: joid suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master - opnfv-jump-1: installer: apex suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master - virtual: installer: fuel suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master - - virtual: + - huawei-virtual: installer: compass suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master - virtual: installer: joid suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master #-------------------------------- @@ -115,12 +144,22 @@ disabled: false + concurrent: true + + properties: + - throttle: + enabled: true + max-per-node: 1 + wrappers: - build-name: name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 180 + abort: true triggers: - - 'yardstick-{pod}-trigger' + - '{auto-trigger-name}' parameters: - project-parameter: @@ -294,7 +333,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-r 213.77.62.197/results' + default: '-i 10.118.36.90:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -302,7 +341,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-r 213.77.62.197/results' + default: '-i 10.118.36.90:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -350,61 +389,11 @@ ####################### # trigger for PODs to only run yardstick test suites - trigger: - name: 'yardstick-zte-build-1-trigger' + name: 'yardstick-daily-zte-build-1-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'yardstick-intel-pod5-trigger' - triggers: - - timed: '' - -- trigger: - name: 'yardstick-intel-pod6-trigger' - triggers: - - timed: '' - -- trigger: - name: 'yardstick-intel-pod8-trigger' - triggers: - - timed: '' - -- trigger: - name: 'yardstick-ericsson-pod1-trigger' - triggers: - - timed: '' - -- trigger: - name: 'yardstick-ericsson-pod2-trigger' - triggers: - - timed: '' - -- trigger: - name: 'yardstick-opnfv-jump-1-trigger' - triggers: - - timed: '' - -- trigger: - name: 'yardstick-opnfv-jump-2-trigger' - triggers: - - timed: '' - -- trigger: - name: 'yardstick-huawei-us-deploy-bare-1-trigger' - triggers: - - timed: '' - -- trigger: - name: 'yardstick-orange-pod2-trigger' - triggers: - - timed: '' - -- trigger: - name: 'yardstick-virtual-trigger' - triggers: - - timed: '' - -- trigger: - name: 'yardstick-huawei-virtual-trigger' + name: 'yardstick-vtcdaily-ericsson-pod1-trigger' triggers: - - timed: '' + - timed: '0 1 * * *' diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index 4f978e189..f8f1abbff 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: @@ -102,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 @@ -111,7 +117,21 @@ cd $WORKSPACE virtualenv $WORKSPACE/yardstick_venv source $WORKSPACE/yardstick_venv/bin/activate + + # install python packages easy_install -U setuptools python setup.py develop + + # 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 |