summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiddharth Gogar <siddharth.gogar@flex.com>2017-08-29 17:46:38 -0700
committerAric Gardner <agardner@linuxfoundation.org>2017-09-11 19:52:47 +0000
commite958d2e2a7a2f92e5227d2c3e3c73a050fca72a9 (patch)
tree6cc6fcff854cf7b0de5f5bfba1066e9b6c6b9746
parentee1a34349b573c02e49c11f20291f4975096df23 (diff)
Add flex-pod1 details in yardstick daily jobs
Add slave params for flex-pod1 Change-Id: I25e93fe2231e604321f8ea7ca18eba45ecc3ee13 Signed-off-by: Siddharth Gogar <siddharth.gogar@flex.com>
-rw-r--r--jjb/global/slave-params.yml15
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yml13
2 files changed, 28 insertions, 0 deletions
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index a4ee4d9f1..59c9461be 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -978,6 +978,21 @@
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+ name: 'flex-pod1-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - flex-pod1
+ default-slaves:
+ - flex-pod1
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+
#####################################################
# These slaves are just dummy slaves for sandbox jobs
#####################################################
diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 937e83fb5..5d38a0b7d 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -186,6 +186,11 @@
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
+ - flex-pod1:
+ slave-label: '{pod}'
+ installer: apex
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
#--------------------------------
testsuite:
- 'daily'
@@ -457,6 +462,14 @@
default: '-i 104.197.68.199:8086'
description: 'Arguments to use in order to choose the backend DB'
+- parameter:
+ name: 'yardstick-params-flex-pod1'
+ parameters:
+ - string:
+ name: YARDSTICK_DB_BACKEND
+ default: '-i 104.197.68.199:8086'
+ description: 'Arguments to use in order to choose the backend DB'
+
#######################
## trigger macros
#######################