summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-11-18 00:31:18 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-11-18 12:44:11 +0000
commit9b086e3ca1224f8ab86bd66bfe1d9a9c3c29161c (patch)
tree3d1fd4e53dd9c6af5e4f709594b2951db5b3d439
parentd927266e701ff450e18463ae59333fb03542bcac (diff)
Fix GIT_BASE, timer and downstream triggers and add POD_NAME parameter
Change-Id: Icaac4447fad172161ba455ebb476ed39720f3ba5 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/fuel/fuel.yml2
-rw-r--r--jjb/yardstick/yardstick.yml32
2 files changed, 29 insertions, 5 deletions
diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml
index b99bcc0d4..1f53454e3 100644
--- a/jjb/fuel/fuel.yml
+++ b/jjb/fuel/fuel.yml
@@ -336,7 +336,7 @@
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
- trigger-builds:
- - project: 'yardstick-fuel-{stream}'
+ - project: 'yardstick-fuel-lf-{stream}'
block: true
block-thresholds:
build-step-failure-threshold: 'never'
diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml
index 7c40096cd..60344fa11 100644
--- a/jjb/yardstick/yardstick.yml
+++ b/jjb/yardstick/yardstick.yml
@@ -171,6 +171,11 @@
parameters:
- project-parameter:
project: '{project}'
+ - '{pod}-parameters'
+ - string:
+ name: POD_NAME
+ default: '{pod}'
+ description: "POD where the job runs"
- string:
name: INSTALLER_TYPE
default: '{installer_type}'
@@ -242,14 +247,33 @@
!include-raw ../../utils/fetch_os_creds.sh
########################
+# parameter macros
+########################
+- parameter:
+ name: 'ericsson-parameters'
+ parameters:
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+
+- parameter:
+ name: 'lf-parameters'
+ parameters:
+ - string:
+ name: GIT_BASE
+ default: ssh://gerrit.opnfv.org:29418/$PROJECT
+ description: "URL for LF POD"
+
+########################
# trigger macros
########################
- trigger:
- name: yardstick-trigger-ericsson
+ name: 'yardstick-trigger-ericsson'
triggers:
- timed: "@midnight"
+ - timed: '@midnight'
- trigger:
- name: yardstick-trigger-lf
+ name: 'yardstick-trigger-lf'
triggers:
- timed: "#@midnight"
+ - timed: '#@midnight'