From be6e0f1041ce0e6327aa5cdff59ffba1cd6601dd Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 1 Sep 2016 20:18:18 +0200 Subject: armband: Fix default params for labeled pods After previous change introducing the usage of node labels for Armband CI deploy jobs, we discovered that the old params were not applied to labeled pods. To complicate things, we had different DEFAULT_BRIDGE params for each CI pod, which contradicts the Jenkins templating paradigm. Since we already have a mechanism in place for overriding env vars based on the POD we are running against, move both and params to our local_env, which is sourced by the deploy script and can apply POD specific configuration. Add missing LAB_CONFIG_URL to newly added baremetal and virtual defaults for Armband. While at it, also replace "brahmaputra" comments with "colorado". v2 -> v3: Source local_env before using DEFAULT_BRIDGE in . Previously, we (Armband) sourced this file in our [1], which will be dropped after this change is merged. [1] https://git.opnfv.org/cgit/armband/tree/ci/deploy.sh#n24 Change-Id: Ibafea25b3df8c3118ce05e3f40934c8e8b9c8dcd Signed-off-by: Alexandru Avadanii --- jjb/armband/armband-deploy.sh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'jjb/armband/armband-deploy.sh') 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. -- cgit 1.2.3-korg