summaryrefslogtreecommitdiffstats
path: root/jjb/global
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-07 01:58:32 +0200
committerAric Gardner <agardner@linuxfoundation.org>2017-10-10 19:33:24 +0000
commitea2f9cd48459650545e7ea22c33eb6ce9ff9da33 (patch)
treeab256169e8136db41dc60cfec8391954948555e2 /jjb/global
parent0a53645f5a262d198d61da2eea9a7ef85a233c63 (diff)
globals/slave-params: Remove unused Fuel overrides
Cleanup some unused parameter overrides, which were never in effect in the first place. For CI PODs, we inherit only installer specific parameters, so slave-label based overrides are ignored. PODs: - arm-pod5; - arm-virtual2; - ericsson-pod1; - lf-pod2; This reverts commit bb22c8c02df3e9d030ff64c304536c31b78a37a6. This reverts commit fc26623f9d7f211a9e29e246a2b13bdae5b3982b. Change-Id: Iee80ad8357f5126c4aa7510ed66ab6e79c20f3fc
Diffstat (limited to 'jjb/global')
-rw-r--r--jjb/global/slave-params.yml64
1 files changed, 0 insertions, 64 deletions
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 8739a78a3..5b94607e5 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -141,21 +141,6 @@
- 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:
@@ -175,21 +160,6 @@
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:
@@ -521,25 +491,6 @@
# Parameters for none-CI PODs
#####################################################
- parameter:
- name: 'ericsson-pod1-defaults'
- parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - ericsson-pod1
- default-slaves:
- - ericsson-pod1
- - string:
- name: INSTALLER_IP
- default: '10.20.1.2'
- description: 'IP of the installer'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
name: 'cengn-pod1-defaults'
parameters:
- node:
@@ -919,21 +870,6 @@
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: