From 67d6681bd7c367c33ae834ae4db409e2c1f0fd08 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Wed, 18 Jan 2017 19:41:44 +0100 Subject: storperf: Fix GIT_BASE for slave and disable danube daily job Change-Id: Ia6c544901fb9c7c434104c095b9e2f173f7f5571 Signed-off-by: Fatih Degirmenci --- jjb/global/slave-params.yml | 14 ++++++++++++++ jjb/storperf/storperf.yml | 5 ++--- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'jjb') diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 39a1b1b9c..9d08487a3 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -363,6 +363,20 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' +- parameter: + name: 'intel-pod9-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod9 + default-slaves: + - intel-pod9 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' - parameter: name: 'intel-pod3-defaults' parameters: diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index 902fff999..8f42f8c06 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -144,15 +144,14 @@ # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - node: storperf-pod - - disabled: false + disabled: '{obj:disabled}' parameters: - project-parameter: project: '{project}' - gerrit-parameter: branch: '{branch}' + - 'intel-pod9-defaults' scm: - git-scm -- cgit 1.2.3-korg