summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-01-18 19:41:44 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-01-18 19:41:44 +0100
commit67d6681bd7c367c33ae834ae4db409e2c1f0fd08 (patch)
treebed531d1c97250caaf52a31ba66f3b944cd281ca
parent685500319fb6043c189374c07b324ac3dd0fc269 (diff)
storperf: Fix GIT_BASE for slave and disable danube daily job
Change-Id: Ia6c544901fb9c7c434104c095b9e2f173f7f5571 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/global/slave-params.yml14
-rw-r--r--jjb/storperf/storperf.yml5
2 files changed, 16 insertions, 3 deletions
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
@@ -364,6 +364,20 @@
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:
- node:
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