diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-02-26 09:13:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-26 09:13:26 +0000 |
| commit | f7d45dc1be1d9c3e19578c76cf291515c5edde24 (patch) | |
| tree | e2ec1f82bad2b3c1ec4491b2e9658ac1f5680f10 /jjb | |
| parent | 636e8626bd5aa782c050fbfe2e6237835e652f0d (diff) | |
| parent | 15760a824b26deb2a87a67118bc4117bb13e9608 (diff) | |
Merge "Add huawei slave to run yardstick"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 22 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 18 |
2 files changed, 40 insertions, 0 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 0090f13b0..cc196737b 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -266,6 +266,28 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'huawei-sh-test-2-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - huawei-sh-test-2 + default-slaves: + - huawei-sh-test-2 + - 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: - label: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index ec3bbe193..9566651ff 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -133,6 +133,11 @@ suite: daily auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master + - huawei-sh-test-2: + installer: compass + suite: daily + auto-trigger-name: 'yardstick-daily-huawei-sh-test-2-trigger' + <<: *master - virtual: installer: joid suite: daily @@ -395,6 +400,14 @@ default: '' description: 'Arguments to use in order to choose the backend DB' +- parameter: + name: 'yardstick-params-huawei-sh-test-2' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '' + description: 'Arguments to use in order to choose the backend DB' + ####################### ## trigger macros ####################### @@ -408,3 +421,8 @@ name: 'yardstick-vtcdaily-ericsson-pod1-trigger' triggers: - timed: '0 1 * * *' + +- trigger: + name: 'yardstick-daily-huawei-sh-test-2-trigger' + triggers: + - timed: '0 1 * * *' |