No longer hard-code OpenStack username per env

Issue-ID: INT-278
Change-Id: Id715784a772048c8dfa60762069ccfd67f72984b
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/test/ete/labs/windriver/Integration-Jenkins-openrc.sh b/test/ete/labs/windriver/Integration-Jenkins-openrc.sh
index feec97d..ca2e2c2 100644 (file)
--- a/test/ete/labs/windriver/Integration-Jenkins-openrc.sh
+++ b/test/ete/labs/windriver/Integration-Jenkins-openrc.sh
@@ -29,7 +29,7 @@ unset OS_TENANT_NAME
 if [ -z ${OS_USERNAME_INPUT+x} ]; then
     read -sp "Please enter your OpenStack Username for project $OS_PROJECT_NAME: " OS_USERNAME_INPUT
 fi
-export OS_USERNAME=OS_USERNAME_INPUT
+export OS_USERNAME=$OS_USERNAME_INPUT
 
 # With Keystone you pass the keystone password.
 if [ -z ${OS_PASSWORD_INPUT+x} ]; then

diff --git a/test/ete/labs/windriver/Integration-SB-04-openrc.sh b/test/ete/labs/windriver/Integration-SB-04-openrc.sh
index 52eb4df..e7cee93 100644 (file)
--- a/test/ete/labs/windriver/Integration-SB-04-openrc.sh
+++ b/test/ete/labs/windriver/Integration-SB-04-openrc.sh
@@ -31,7 +31,7 @@ unset OS_TENANT_NAME
 if [ -z ${OS_USERNAME_INPUT+x} ]; then
     read -sp "Please enter your OpenStack Username for project $OS_PROJECT_NAME: " OS_USERNAME_INPUT
 fi
-export OS_USERNAME=OS_USERNAME_INPUT
+export OS_USERNAME=$OS_USERNAME_INPUT
 
 # With Keystone you pass the keystone password.
 if [ -z ${OS_PASSWORD_INPUT+x} ]; then