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>

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 002ab7e..cb9d08f 100644 (file)
--- 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 1cb6d1f..220542b 100644 (file)
--- 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'
+