X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-ci-jobs.yml;h=9e623b7c1baa9857844f5255bfb430ea75ccf317;hb=cf5df623fba001172d09f425ac861fa5f586d87f;hp=31243ff4eab83cc616a9f3d81845a70d22c6b301;hpb=b631d34331e5c8e6e27374777d7196e71888cd25;p=releng.git diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 31243ff4e..9e623b7c1 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 #-------------------------------- @@ -25,58 +27,161 @@ pod: - 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 + - orange-pod2: + 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: + - zte-pod1: installer: fuel + suite: daily + auto-trigger-name: 'yardstick-daily-zte-pod1-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 + - huawei-us-deploy-bare-2: + installer: compass + suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *master + - virtual: + installer: fuel + suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *master + - huawei-virtual: + installer: compass + 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 + - huawei-sh-pod6: + installer: compass + suite: daily + auto-trigger-name: 'yardstick-daily-huawei-sh-pod6-trigger' + <<: *master + - virtual: + installer: joid + suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master #-------------------------------- - loop: - - daily jobs: - - 'yardstick-{installer}-{pod}-{loop}-{stream}' + - 'yardstick-{installer}-{pod}-{suite}-{stream}' ################################ # job templates ################################ - job-template: - name: 'yardstick-{installer}-{pod}-{loop}-{stream}' + name: 'yardstick-{installer}-{pod}-{suite}-{stream}' 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: + - '{auto-trigger-name}' parameters: - project-parameter: @@ -84,9 +189,16 @@ - '{pod}-defaults' - '{installer}-defaults' - 'yardstick-params-{pod}' + - string: + 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}}_{loop}.yaml + default: opnfv_${{NODE_NAME}}_{suite}.yaml description: 'Path to test suite' - string: name: CI_DEBUG @@ -102,11 +214,11 @@ builders: - 'yardstick-cleanup' #- 'yardstick-fetch-os-creds' - - 'yardstick-daily' + - 'yardstick-{suite}' publishers: - email: - recipients: ana.cunha@ericsson.com jorgen.w.karlsson@ericsson.com + recipients: ana.cunha@ericsson.com ######################## # builder macros @@ -146,7 +258,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 \ @@ -156,6 +268,17 @@ echo "Yardstick: done!" +- builder: + name: yardstick-vtcdaily + builders: + - shell: | + #!/bin/bash + set -e + [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" + + cd $WORKSPACE + ./ci/apexlake-verify + - builder: name: yardstick-fetch-os-creds builders: @@ -196,7 +319,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: @@ -204,7 +327,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: @@ -220,7 +343,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: @@ -228,25 +351,59 @@ 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: name: 'yardstick-params-opnfv-jump-1' 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: name: 'yardstick-params-opnfv-jump-2' 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: name: 'yardstick-params-huawei-us-deploy-bare-1' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: + name: 'yardstick-params-huawei-us-deploy-bare-2' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: + name: 'yardstick-params-zte-pod1' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: + name: 'yardstick-params-orange-pod2' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: + name: 'yardstick-params-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -254,7 +411,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-zte-build-1' + name: 'yardstick-params-huawei-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -262,9 +419,41 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-orange-pod2' + 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' + +- parameter: + name: 'yardstick-params-huawei-sh-pod6' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '' + description: 'Arguments to use in order to choose the backend DB' + +####################### +## trigger macros +####################### +# trigger for PODs to only run yardstick test suites +- trigger: + name: 'yardstick-daily-zte-pod1-trigger' + triggers: + - timed: '0 2 * * *' + +- trigger: + name: 'yardstick-vtcdaily-ericsson-pod1-trigger' + triggers: + - timed: '0 1 * * *' + +- trigger: + name: 'yardstick-daily-huawei-sh-test-2-trigger' + triggers: + - timed: '0 1 * * *' + +- trigger: + name: 'yardstick-daily-huawei-sh-pod6-trigger' + triggers: + - timed: '0 1 * * *'