diff options
author | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-09-06 10:56:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-06 10:56:39 +0000 |
commit | f52da7a2a02fb17836063272351b56a6aff31d06 (patch) | |
tree | ce6d53d5d7694a559b6bc24e003cb55289975183 /jjb/yardstick | |
parent | cbe3739fbbbf50ec74dcde145e86087698d5e2a9 (diff) | |
parent | e90147ecd915387ae2e426958567427b40a87d4c (diff) |
Merge "yardstick: updated yardstick jobs for armband to use labels"
Diffstat (limited to 'jjb/yardstick')
-rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index c2dbfcdd0..dd88a52b6 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -49,6 +49,27 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *colorado +# armband CI PODs + - armband-baremetal: + slave-label: armband-baremetal + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - armband-virtual: + slave-label: armband-virtual + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - armband-baremetal: + slave-label: armband-baremetal + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado + - armband-virtual: + slave-label: armband-virtual + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado # joid CI PODs - baremetal: slave-label: joid-baremetal @@ -141,7 +162,7 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *colorado - - arm-pod1: + - arm-pod2: slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' @@ -282,6 +303,20 @@ default: '' description: 'Arguments to use in order to choose the backend DB' - parameter: + name: 'yardstick-params-armband-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-armband-virtual' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '' + description: 'Arguments to use in order to choose the backend DB' +- parameter: name: 'yardstick-params-joid-baremetal' parameters: - string: @@ -375,7 +410,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-arm-pod1' + name: 'yardstick-params-arm-pod2' parameters: - string: name: YARDSTICK_DB_BACKEND |