diff options
Diffstat (limited to 'jjb/yardstick/yardstick-ci-jobs.yml')
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index c6630d7bc..3d59e61ce 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -28,6 +28,7 @@ # that have been switched using labels for slaves #-------------------------------- pod: +# fuel CI PODs - baremetal: slave-label: fuel-baremetal installer: fuel @@ -55,6 +56,28 @@ installer: fuel auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master + +# joid CI PODs + - baremetal: + slave-label: joid-baremetal + installer: joid + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *master + - virtual: + slave-label: joid-virtual + installer: joid + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *master + - baremetal: + slave-label: joid-baremetal + installer: joid + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *brahmaputra + - virtual: + slave-label: joid-virtual + installer: joid + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *brahmaputra #-------------------------------- # Installers not using labels # CI PODs @@ -81,16 +104,6 @@ installer: compass auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - - intel-pod6: - slave-label: '{pod}' - installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master - - intel-pod5: - slave-label: '{pod}' - installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *brahmaputra #-------------------------------- # None-CI PODs #-------------------------------- @@ -137,21 +150,11 @@ installer: compass auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger' <<: *master - - virtual: - slave-label: '{pod}' - installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master - huawei-virtual: slave-label: '{pod}' installer: compass auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - - virtual: - slave-label: '{pod}' - installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *brahmaputra #-------------------------------- testsuite: - 'daily' @@ -251,45 +254,42 @@ # 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-lf-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-lf-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-fuel-baremetal' + name: 'yardstick-params-lf-pod1' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -297,11 +297,11 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-fuel-virtual' + name: 'yardstick-params-lf-pod2' 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: |