X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-ci-jobs.yml;h=041eabd03d77ce3ab58f23814d199f9cefaf5ea5;hb=a606f48f5b7450b1ee53d5de77192b9d375466ac;hp=b7c1c0a82dcecd7957241f5a92a72bc42bd0ecca;hpb=a863989bb1336e0c1822c78a0dbb4b2c6f1bef44;p=releng.git diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index b7c1c0a82..041eabd03 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -22,147 +22,137 @@ #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# brahmaputra +# Installers using labels +# CI PODs +# This section should only contain the installers +# that have been switched using labels for slaves #-------------------------------- pod: - - lf-pod1: - installer: apex - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' +# fuel CI PODs + - baremetal: + slave-label: fuel-baremetal + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - virtual: + slave-label: fuel-virtual + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - baremetal: + slave-label: fuel-baremetal + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra - - lf-pod2: + - virtual: + slave-label: fuel-virtual installer: fuel - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra - - intel-pod5: +# joid CI PODs + - baremetal: + slave-label: joid-baremetal installer: joid - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - virtual: + slave-label: joid-virtual + installer: joid + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - baremetal: + slave-label: joid-baremetal + installer: joid + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra - - orange-pod2: + - virtual: + slave-label: joid-virtual installer: joid - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra - - huawei-pod1: + +# compass CI PODs + - baremetal: + slave-label: compass-baremetal 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 + auto-trigger-name: 'daily-trigger-disabled' + <<: *master - virtual: - installer: fuel - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *brahmaputra - - huawei-virtual: + slave-label: compass-virtual + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - baremetal: + slave-label: compass-baremetal installer: compass - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra - virtual: - installer: joid - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + slave-label: compass-virtual + installer: compass + auto-trigger-name: 'daily-trigger-disabled' <<: *brahmaputra #-------------------------------- -# master +# Installers not using labels +# CI PODs +# This section should only contain the installers +# that have not been switched using labels for slaves #-------------------------------- - lf-pod1: + slave-label: '{pod}' installer: apex - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master - - lf-pod2: - installer: fuel - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-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: + - lf-pod1: + slave-label: '{pod}' + installer: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *brahmaputra +#-------------------------------- +# None-CI PODs +#-------------------------------- + - orange-pod2: + slave-label: '{pod}' 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 + auto-trigger-name: 'daily-trigger-disabled' + <<: *brahmaputra - zte-pod1: + slave-label: '{pod}' installer: fuel - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - orange-pod2: + slave-label: '{pod}' installer: joid - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - huawei-pod2: + slave-label: '{pod}' 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' + auto-trigger-name: 'daily-trigger-disabled' <<: *master - huawei-pod3: + slave-label: '{pod}' installer: compass - suite: daily auto-trigger-name: 'yardstick-daily-huawei-pod3-trigger' <<: *master - huawei-pod4: + slave-label: '{pod}' installer: compass - suite: daily auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger' <<: *master - - virtual: - installer: joid - suite: daily - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master #-------------------------------- + testsuite: + - 'daily' jobs: - - 'yardstick-{installer}-{pod}-{suite}-{stream}' + - 'yardstick-{installer}-{pod}-{testsuite}-{stream}' ################################ # job templates ################################ - job-template: - name: 'yardstick-{installer}-{pod}-{suite}-{stream}' + name: 'yardstick-{installer}-{pod}-{testsuite}-{stream}' disabled: false @@ -172,6 +162,7 @@ - throttle: enabled: true max-per-node: 1 + option: 'project' wrappers: - build-name: @@ -186,9 +177,9 @@ parameters: - project-parameter: project: '{project}' - - '{pod}-defaults' + - '{slave-label}-defaults' - '{installer}-defaults' - - 'yardstick-params-{pod}' + - 'yardstick-params-{slave-label}' - string: name: DEPLOY_SCENARIO default: 'os-odl_l2-nofeature-ha' @@ -197,9 +188,9 @@ 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' + name: YARDSTICK_SCENARIO_SUITE_NAME + default: opnfv_${{DEPLOY_SCENARIO}}_{testsuite}.yaml + description: 'Path to test scenario suite' - string: name: CI_DEBUG default: 'false' @@ -212,9 +203,11 @@ branch: '{branch}' builders: + - description-setter: + description: "POD: $NODE_NAME" - 'yardstick-cleanup' #- 'yardstick-fetch-os-creds' - - 'yardstick-{suite}' + - 'yardstick-{testsuite}' publishers: - email: @@ -250,45 +243,40 @@ # parameter macros ######################## - parameter: - name: 'yardstick-params-intel-pod5' + name: 'yardstick-params-fuel-baremetal' 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-intel-pod6' + name: 'yardstick-params-fuel-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 104.197.68.199:8086' + default: '' description: 'Arguments to use in order to choose the backend DB' - - parameter: - name: 'yardstick-params-intel-pod8' + name: 'yardstick-params-joid-baremetal' 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: - name: 'yardstick-params-ericsson-pod1' + name: 'yardstick-params-joid-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 104.197.68.199:8086' + default: '' description: 'Arguments to use in order to choose the backend DB' - - parameter: - name: 'yardstick-params-ericsson-pod2' + name: 'yardstick-params-intel-pod8' parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 104.197.68.199:8086' + default: '' description: 'Arguments to use in order to choose the backend DB' - - parameter: name: 'yardstick-params-lf-pod1' parameters: @@ -306,7 +294,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-huawei-pod1' + name: 'yardstick-params-compass-baremetal' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -329,6 +317,14 @@ default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' +- parameter: + name: 'yardstick-params-zte-pod3' + 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: @@ -346,7 +342,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-huawei-virtual' + name: 'yardstick-params-compass-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -373,11 +369,6 @@ ## trigger macros ####################### # trigger for PODs to only run yardstick test suites -- trigger: - name: 'yardstick-vtcdaily-ericsson-pod1-trigger' - triggers: - - timed: '0 1 * * *' - - trigger: name: 'yardstick-daily-huawei-pod3-trigger' triggers: