From 63c4312157db00bed05bd1160d5fcd3d45f9307d Mon Sep 17 00:00:00 2001 From: kubi Date: Fri, 1 Apr 2016 15:43:59 +0800 Subject: [PATCH] Add a new Huawei slave (3+2) to run yardstick Change-Id: If4bc1826899e57f332c639aacbc45184aea47881 JIRA:- Signed-off-by: kubi --- jjb/opnfv/slave-params.yml | 22 ++++++++++++++++++++++ jjb/yardstick/yardstick-ci-jobs.yml | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index c0dc0cd59..fb9d66450 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -287,6 +287,28 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'huawei-sh-pod6-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - huawei-sh-pod6 + default-slaves: + - huawei-sh-pod6 + - label: + name: SLAVE_LABEL + default: 'huawei-test' + - string: + name: INSTALLER_VERSION + default: stable + description: 'Version of the installer to deploy' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - parameter: name: 'opnfv-build-defaults' parameters: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index f3c0ad4b1..57aa29c54 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -143,6 +143,11 @@ suite: daily auto-trigger-name: 'yardstick-daily-huawei-sh-test-2-trigger' <<: *master + - huawei-sh-pod6: + installer: compass + suite: daily + auto-trigger-name: 'yardstick-daily-huawei-sh-pod6-trigger' + <<: *master - virtual: installer: joid suite: daily @@ -421,6 +426,14 @@ default: '' description: 'Arguments to use in order to choose the backend DB' +- parameter: + name: 'yardstick-params-huawei-sh-pod6' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '' + description: 'Arguments to use in order to choose the backend DB' + ####################### ## trigger macros ####################### @@ -439,3 +452,8 @@ name: 'yardstick-daily-huawei-sh-test-2-trigger' triggers: - timed: '0 1 * * *' + +- trigger: + name: 'yardstick-daily-huawei-sh-pod6-trigger' + triggers: + - timed: '0 1 * * *' \ No newline at end of file -- 2.16.6