diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-09-01 20:18:18 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-09-01 22:03:02 +0200 |
| commit | be6e0f1041ce0e6327aa5cdff59ffba1cd6601dd (patch) | |
| tree | 02602bf0d0c236340a05b705245be35f7492e546 /jjb/armband | |
| parent | 1fd1026c60256d896952e40a6c45bc53efd6a836 (diff) | |
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
<DEPLOY_TIMEOUT> and <DEFAULT_BRIDGE> 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 <armband-deploy.sh>.
Previously, we (Armband) sourced this file in our <ci/deploy.sh> [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 <Alexandru.Avadanii@enea.com>
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. |