summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-01-13 17:09:53 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-13 17:09:53 +0000
commitb143598241c531b00b464243290313f50e7eed9e (patch)
tree655394aa76fa5bd7c59569343e9e5fa2d0f97045 /jjb
parent69989818e835bd10e19e1bd67ccf425cb6fe4ac0 (diff)
parentdbec47faf77a94f8e7ff3324bc08e140c74b3cf9 (diff)
Merge "apex, yardstick: integrate yardstick into apex"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml7
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml14
2 files changed, 20 insertions, 1 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index be595d4a3..a2c105366 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -300,6 +300,13 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
########################
# parameter macros
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 21390792a..de79bce79 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -23,6 +23,9 @@
# brahmaputra
#--------------------------------
pod:
+ - opnfv-jump-1:
+ installer: apex
+ <<: *brahmaputra
- opnfv-jump-2:
installer: fuel
<<: *brahmaputra
@@ -53,6 +56,9 @@
- orange-pod2:
installer: joid
<<: *master
+ - opnfv-jump-1:
+ installer: apex
+ <<: *master
#--------------------------------
loop:
- daily
@@ -211,7 +217,13 @@
name: YARDSTICK_DB_BACKEND
default: ''
description: 'Arguments to use in order to choose the backend DB'
-
+- parameter:
+ name: 'yardstick-params-opnfv-jump-1'
+ parameters:
+ - string:
+ name: YARDSTICK_DB_BACKEND
+ default: '-r 213.77.62.197/results'
+ description: 'Arguments to use in order to choose the backend DB'
- parameter:
name: 'yardstick-params-opnfv-jump-2'
parameters: