No longer hard-code OpenStack username per env

Change-Id: Icce527ecaf48b12db08e1f010dcf963924037b0f
Issue-ID: INT-278
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 6c8e2af..feec97d 100644 (file)
--- a/test/ete/labs/windriver/Integration-Jenkins-openrc.sh
+++ b/test/ete/labs/windriver/Integration-Jenkins-openrc.sh
@@ -26,7 +26,10 @@ unset OS_TENANT_NAME
 
 # In addition to the owning entity (tenant), OpenStack stores the entity
 # performing the action as the **user**.
-export OS_USERNAME="gary_wu"
+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
 
 # 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 c7e6501..52eb4df 100644 (file)
--- a/test/ete/labs/windriver/Integration-SB-04-openrc.sh
+++ b/test/ete/labs/windriver/Integration-SB-04-openrc.sh
@@ -26,7 +26,12 @@ unset OS_TENANT_NAME
 
 # In addition to the owning entity (tenant), OpenStack stores the entity
 # performing the action as the **user**.
-export OS_USERNAME="demo"
+# In addition to the owning entity (tenant), OpenStack stores the entity
+# performing the action as the **user**.
+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
 
 # With Keystone you pass the keystone password.
 if [ -z ${OS_PASSWORD_INPUT+x} ]; then