diff options
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 6 | ||||
| -rwxr-xr-x | jjb/armband/armband-deploy.sh | 7 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 24 |
3 files changed, 18 insertions, 19 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 9493cd8f1..bffa91d31 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -235,7 +235,7 @@ triggers: - timed: '0 3 * * 5' #---------------------------------------------------------------------- -# Enea Armband CI Baremetal Triggers running against brahmaputra branch +# Enea Armband CI Baremetal Triggers running against colorado branch #---------------------------------------------------------------------- - trigger: name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-colorado-trigger' @@ -281,7 +281,7 @@ triggers: - timed: '' #-------------------------------------------------------------------- -# Enea Armband CI Virtual Triggers running against brahmaputra branch +# Enea Armband CI Virtual Triggers running against colorado branch #-------------------------------------------------------------------- - trigger: name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-colorado-trigger' @@ -327,7 +327,7 @@ triggers: - timed: '' #--------------------------------------------------------------- -# Enea Armband POD 2 Triggers running against brahmaputra branch +# Enea Armband POD 2 Triggers running against colorado branch #--------------------------------------------------------------- - trigger: name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger' diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh index 901f845bf..d7626509c 100755 --- a/jjb/armband/armband-deploy.sh +++ b/jjb/armband/armband-deploy.sh @@ -50,6 +50,13 @@ if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then echo "cloning $LAB_CONFIG_URL" git clone --quiet --branch ${GIT_BRANCH##origin/} $LAB_CONFIG_URL lab-config LAB_CONFIG_URL=file://${WORKSPACE}/lab-config + + # Source local_env if present, which contains POD-specific config + local_env="$LAB_CONFIG_URL/labs/$LAB_NAME/$POD_NAME/fuel/config/local_env" + if [ -e $local_env ]; then + echo "-- Sourcing local environment file" + source $local_env + fi fi # releng wants us to use nothing else but opnfv.iso for now. We comply. diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 608ce43de..0c8435d6e 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -160,6 +160,10 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: LAB_CONFIG_URL + default: ssh://git@git.enea.com/pharos/lab-config + description: 'Base URI to the configuration directory' - parameter: name: 'joid-baremetal-defaults' parameters: @@ -221,6 +225,10 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: LAB_CONFIG_URL + default: ssh://git@git.enea.com/pharos/lab-config + description: 'Base URI to the configuration directory' - parameter: name: 'joid-virtual-defaults' parameters: @@ -610,14 +618,6 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - string: - name: DEFAULT_BRIDGE - default: 'admin6_br0,public6_br0' - desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.' - - string: - name: DEPLOY_TIMEOUT - default: '360' - description: 'Deployment timeout in minutes' - - string: name: LAB_CONFIG_URL default: ssh://git@git.enea.com/pharos/lab-config description: 'Base URI to the configuration directory' @@ -636,14 +636,6 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - string: - name: DEFAULT_BRIDGE - default: 'admin_br0,public_br0' - desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.' - - string: - name: DEPLOY_TIMEOUT - default: '360' - description: 'Deployment timeout in minutes' - - string: name: LAB_CONFIG_URL default: ssh://git@git.enea.com/pharos/lab-config description: 'Base URI to the configuration directory' |