diff options
Diffstat (limited to 'jjb/armband')
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 6 | ||||
| -rwxr-xr-x | jjb/armband/armband-deploy.sh | 7 |
2 files changed, 10 insertions, 3 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. |