From 9227a9756fae91829d67137cfabdc02b764097c3 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Wed, 18 Oct 2017 15:53:48 +0800 Subject: 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 --- jjb/yardstick/yardstick-daily-jobs.yml | 36 +++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'jjb/yardstick') 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 @@ -397,6 +403,22 @@ default: '-i 104.197.68.199:8086' 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: -- cgit 1.2.3-korg