diff options
author | 2016-09-02 08:48:01 +0000 | |
---|---|---|
committer | 2016-09-02 08:48:01 +0000 | |
commit | 975404b0b57444da4fcfac64a161fa5554b1ce9b (patch) | |
tree | 77a6e3d50fe7a626dba01d01768f3aa0d49ddc7b /jjb/armband/armband-deploy.sh | |
parent | 40201bda4fc35e1ff6843aad0a5948711ccdc4b2 (diff) | |
parent | be6e0f1041ce0e6327aa5cdff59ffba1cd6601dd (diff) |
Merge "armband: Fix default params for labeled pods"
Diffstat (limited to 'jjb/armband/armband-deploy.sh')
-rwxr-xr-x | jjb/armband/armband-deploy.sh | 7 |
1 files changed, 7 insertions, 0 deletions
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. |