From 9b086e3ca1224f8ab86bd66bfe1d9a9c3c29161c Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Wed, 18 Nov 2015 00:31:18 +0100
Subject: Fix GIT_BASE, timer and downstream triggers and add POD_NAME
 parameter

Change-Id: Icaac4447fad172161ba455ebb476ed39720f3ba5
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/fuel/fuel.yml           |  2 +-
 jjb/yardstick/yardstick.yml | 32 ++++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

(limited to 'jjb')

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}'
@@ -241,15 +246,34 @@
         - shell:
             !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'
-- 
cgit 1.2.3-korg