summaryrefslogtreecommitdiffstats
path: root/jjb/yardstick
diff options
context:
space:
mode:
authorAlex Yang <yangyang1@zte.com.cn>2017-10-18 15:53:48 +0800
committerAlex Yang <yangyang1@zte.com.cn>2017-10-19 09:56:41 +0800
commit9227a9756fae91829d67137cfabdc02b764097c3 (patch)
treed880d831ecd91366613b25b340f6aa595be756fa /jjb/yardstick
parentb040e3b644262b544d24a74f5787f6cb4e0476c8 (diff)
Integrate yardstick on daisy master branch
JIRA: DAISY-9 1. Trigger yardstick job in daisy-baremetal-daily-master on zte-pod3 2. Add daisy pods in yardstick 3. Add EXTERNAL_NETWORK in installer params Change-Id: Ia8e69e503102c1fb282d6d2c5acac2ac3cbfe747 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Diffstat (limited to 'jjb/yardstick')
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yml36
1 files changed, 29 insertions, 7 deletions
diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 15686a26a..481af2a42 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -134,6 +134,17 @@
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *euphrates
+ # daisy CI PODs
+ - baremetal:
+ slave-label: zte-pod3
+ installer: daisy
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
+ - virtual:
+ slave-label: daisy-virtual
+ installer: daisy
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
# -------------------------------
# None-CI PODs
# -------------------------------
@@ -154,19 +165,14 @@
<<: *euphrates
- zte-pod2:
slave-label: '{pod}'
- installer: fuel
+ installer: daisy
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- zte-pod3:
slave-label: '{pod}'
- installer: fuel
+ installer: daisy
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- - zte-pod3:
- slave-label: '{pod}'
- installer: fuel
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
- orange-pod2:
slave-label: '{pod}'
installer: joid
@@ -398,6 +404,22 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
+ name: 'yardstick-params-daisy-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-daisy-virtual'
+ 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: