summaryrefslogtreecommitdiffstats
path: root/jjb/global
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/global')
-rw-r--r--jjb/global/installer-params.yml4
-rw-r--r--jjb/global/slave-params.yml15
2 files changed, 15 insertions, 4 deletions
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index b64a41e91..8c01a9f1f 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -39,10 +39,6 @@
default: '10.20.0.2'
description: 'IP of the installer'
- string:
- name: SALT_MASTER_IP
- default: '192.168.10.100'
- description: 'IP of the salt master (for mcp deployments)'
- - string:
name: SSH_KEY
default: "/var/lib/opnfv/mcp.rsa"
description: 'Path to private SSH key to access environment nodes'
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index a4ee4d9f1..59c9461be 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -978,6 +978,21 @@
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+ name: 'flex-pod1-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - flex-pod1
+ default-slaves:
+ - flex-pod1
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+
#####################################################
# These slaves are just dummy slaves for sandbox jobs
#####################################################