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>

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 9493cd8..bffa91d 100644 (file)
--- 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 901f845..d762650 100755 (executable)
--- 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 608ce43..0c8435d 100644 (file)
--- 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:
@@ -609,14 +617,6 @@
             name: GIT_BASE
             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
@@ -635,14 +635,6 @@
             name: GIT_BASE
             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