diff options
Diffstat (limited to 'jjb/global')
| -rw-r--r-- | jjb/global/installer-params.yml | 6 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 10 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 64 |
3 files changed, 75 insertions, 5 deletions
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index ecef6d3b7..8c01a9f1f 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -39,12 +39,8 @@ 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: "$HOME/opnfv/mcp.rsa" + default: "/var/lib/opnfv/mcp.rsa" description: 'Path to private SSH key to access environment nodes' - string: name: INSTALLER_TYPE diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 20b13b8be..59415f5ca 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -468,6 +468,16 @@ fi - builder: + name: clean-workspace + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o nounset + set -o pipefail + sudo /bin/rm -rf "$WORKSPACE" + +- builder: name: clean-workspace-log builders: - shell: | diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index a4ee4d9f1..19d5a9545 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: @@ -455,6 +485,10 @@ 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' @@ -835,6 +869,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: @@ -978,6 +1027,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 ##################################################### |