summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorwu.zhihui <wu.zhihui1@zte.com.cn>2016-01-04 13:28:28 +0800
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-08 10:04:26 +0000
commitac1003f22ee1929d74278a1e3c1434bba02d5428 (patch)
treebf1fb3e4c7b3485cf40eb8d994d018a9ae2ff14e /jjb
parent22ac4d45b5e7a391c424c322ffa963d252617659 (diff)
Add daily jenkins job for yardstick in ZTE-NJ lab.
Update ZTE jenkins info Deal with other conflicts JIRA: yardstick-210 Change-Id: Ibf6e8409065fcacfedf84cc1d9f8654cddd9924c Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/opnfv/slave-params.yml3
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml12
2 files changed, 14 insertions, 1 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 002ab7e52..cb9d08fed 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -271,7 +271,7 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'zte-build-1'
+ name: 'zte-build-1-defaults'
parameters:
- node:
name: SLAVE_NAME
@@ -361,3 +361,4 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
+
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 1cb6d1f08..220542bfd 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -44,6 +44,9 @@
- huawei-us-deploy-bare-1:
installer: compass
<<: *master
+ - zte-build-1:
+ installer: fuel
+ <<: *master
#--------------------------------
loop:
- daily
@@ -200,3 +203,12 @@
name: YARDSTICK_DB_BACKEND
default: ''
description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+ name: 'yardstick-params-zte-build-1'
+ parameters:
+ - string:
+ name: YARDSTICK_DB_BACKEND
+ default: ''
+ description: 'Arguments to use in order to choose the backend DB'
+