summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2017-09-12 19:29:35 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-12 19:29:35 +0000
commit1456e4f206ec5a3d603f26fecf29e820da45c96d (patch)
tree5433da7e14068bf69f1708e447cbf902c206c946
parent18073adbeb7d1a961b04bb64994d9b647f8d3ef7 (diff)
parentfc26623f9d7f211a9e29e246a2b13bdae5b3982b (diff)
Merge "slave-params: Add fuel/armband bridge information"
-rw-r--r--jjb/global/slave-params.yml45
1 files changed, 45 insertions, 0 deletions
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 59c9461be..2acc96fd9 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -95,6 +95,21 @@
- lf-pod3
- parameter:
+ name: 'arm-pod5-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - arm-pod5
+ default-slaves:
+ - arm-pod5
+ - string:
+ name: BRIDGE
+ default: 'admin7_br0,mgmt7_br0,,public7_br0'
+ description: 'Pre-existing bridges used by Fuel'
+
+- parameter:
name: 'lf-pod1-defaults'
parameters:
- node:
@@ -114,6 +129,21 @@
description: 'SSH key to use for Apex'
- parameter:
+ name: 'lf-pod2-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - lf-pod2
+ default-slaves:
+ - lf-pod2
+ - string:
+ name: BRIDGE
+ default: 'pxebr,br-ctl'
+ description: 'Pre-existing bridges used by Fuel'
+
+- parameter:
name: 'lf-pod3-defaults'
parameters:
- node:
@@ -835,6 +865,21 @@
description: 'SSH key to use for Apex'
- parameter:
+ name: 'arm-virtual2-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - arm-virtual2
+ default-slaves:
+ - arm-virtual2
+ - string:
+ name: BRIDGE
+ default: ',,,public8_br0'
+ description: 'Pre-existing bridges used by Fuel'
+
+- parameter:
name: 'intel-virtual6-defaults'
parameters:
- node: