From: Peter Bandzi <pbandzi@cisco.com>
Date: Thu, 23 Jul 2015 07:32:56 +0000 (+0200)
Subject: Fix unbound variable issue during venv activation
X-Git-Tag: arno.2015.2.0~155
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F1054%2F1;p=releng.git

Fix unbound variable issue during venv activation

JIRA: OCTO-109

Change-Id: Iac5bc0f2135ffce6dee7003ddbf6f174247702b3
Signed-off-by: Peter Bandzi <pbandzi@cisco.com>
---

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index c02fa1c3b..ae359c9cf 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -329,9 +329,13 @@
             # create venv
             sudo $WORKSPACE/releng/utils/lab-reconfiguration/create_venv.sh
 
+            # disable nounset because 'activate' script contains unbound variable(s)
+            set +o nounset
             # enter venv
             source $WORKSPACE/releng/utils/lab-reconfiguration/venv/bin/activate
-            sudo python $WORKSPACE/releng/utils/lab-reconfiguration/reconfigUcsNet.py $ucs_host -u $ucs_user -p $ucs_password -f $WORKSPACE/releng/utils/lab-reconfiguration/foreman.yaml
+            # set nounset back again
+            set -o nounset
+            sudo python $WORKSPACE/releng/utils/lab-reconfiguration/reconfigUcsNet.py -i $ucs_host -u $ucs_user -p $ucs_password -f $WORKSPACE/releng/utils/lab-reconfiguration/foreman.yaml
 
             echo
             echo "--------------------------------------------------------"