Merge "Add huawei slave to run yardstick"

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 0090f13..cc19673 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -265,6 +265,28 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             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:

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index ec3bbe1..9566651 100644 (file)
--- 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 * * *'