[SDC] rebase code

Change-Id: I456ec65a233d277e6bae35e140f2e3da5765bae6
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Signed-off-by: Michael Lando <ml636r@att.com>

5 files changed, 1 insertions, 146 deletions

diff --git a/ui-ci/src/main/resources/ci/conf/credentials.yaml b/ui-ci/src/main/resources/ci/conf/credentials.yaml
deleted file mode 100644
index 481b12b1e0..0000000000
--- a/ui-ci/src/main/resources/ci/conf/credentials.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-    designer: {
-        username: m08740,
-        password: 272v!suAL37,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    admin: {
-        username: m08741,
-        password: 863B@rroN27,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    ops: {
-        username: m08742,
-        password: 364K!NDRed63,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    tester: {
-        username: m08743,
-        password: 373m@rBLE28,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    governor: {
-        username: m08744,
-        password: 742M!DDLE44,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    product_strategist1: {
-        username: m08745,
-        password: 824S@Nder35,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    product_manager1: {
-        username: m08746,
-        password: 747ICK!Y99,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    product_local: {
-        username: m08747,
-        password: 623z!Ggy75,
-        firstname: ASDC,
-        lastname: VITI
-    }
\ No newline at end of file
diff --git a/ui-ci/src/main/resources/ci/conf/credentials.yaml_prod b/ui-ci/src/main/resources/ci/conf/credentials.yaml_prod
deleted file mode 100644
index 481b12b1e0..0000000000
--- a/ui-ci/src/main/resources/ci/conf/credentials.yaml_prod
+++ /dev/null
@@ -1,48 +0,0 @@
-    designer: {
-        username: m08740,
-        password: 272v!suAL37,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    admin: {
-        username: m08741,
-        password: 863B@rroN27,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    ops: {
-        username: m08742,
-        password: 364K!NDRed63,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    tester: {
-        username: m08743,
-        password: 373m@rBLE28,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    governor: {
-        username: m08744,
-        password: 742M!DDLE44,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    product_strategist1: {
-        username: m08745,
-        password: 824S@Nder35,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    product_manager1: {
-        username: m08746,
-        password: 747ICK!Y99,
-        firstname: ASDC,
-        lastname: VITI
-    }
-    product_local: {
-        username: m08747,
-        password: 623z!Ggy75,
-        firstname: ASDC,
-        lastname: VITI
-    }
\ No newline at end of file
diff --git a/ui-ci/src/main/resources/ci/conf/credentials.yaml_webtest b/ui-ci/src/main/resources/ci/conf/credentials.yaml_webtest
deleted file mode 100644
index ab37f7bee8..0000000000
--- a/ui-ci/src/main/resources/ci/conf/credentials.yaml_webtest
+++ /dev/null
@@ -1,48 +0,0 @@
-    designer: {
-        username: cs0008,
-        password: 123123a,
-        firstname: ASDC,
-        lastname: KASPIN
-    }
-    admin: {
-        username: jh0003,
-        password: 123123a,
-        firstname: ASDC,
-        lastname: KASPIN
-    }
-    ops: {
-        username: af0006,
-        password: 123123a,
-        firstname: ASDC,
-        lastname: KASPIN
-    }
-    tester: {
-        username: kb0004,
-        password: 123123a,
-        firstname: ASDC,
-        lastname: KASPIN
-    }
-    governor: {
-        username: ah0002,
-        password: 123123a,
-        firstname: ASDC,
-        lastname: KASPIN
-    }
-    product_strategist: {
-        username: m99126,
-        password: 1910-FruitGum,
-        firstname: ASDC,
-        lastname: KASPIN
-    }
-    product_manager: {
-        username: m99127,
-        password: 747-Airplane,
-        firstname: ASDC,
-        lastname: KASPIN
-    }
-    product_local: {
-        username: pm0001,
-        password: 123123a,
-        firstname: ASDC,
-        lastname: KASPIN
-    }
\ No newline at end of file
diff --git a/ui-ci/src/main/resources/ci/scripts/startTest.sh b/ui-ci/src/main/resources/ci/scripts/startTest.sh
index 737b538b01..c85b6f4cf0 100644
--- a/ui-ci/src/main/resources/ci/scripts/startTest.sh
+++ b/ui-ci/src/main/resources/ci/scripts/startTest.sh
@@ -89,7 +89,7 @@ TARGET_LOG_DIR="${TARGET_DIR}/"
 BE_IP=`cat conf/attsdc.yaml | grep catalogBeHost| awk '{print $2}'`
 
 ADD_USERS_SCRIPT="addUsersFromList_new.sh"
-USER_LIST="userList.txt"
+USER_LIST="/conf/userList.txt"
 chmod +x ${ADD_USERS_SCRIPT}
 echo "add users..."
 `./${ADD_USERS_SCRIPT} -ip ${BE_IP} -f ${USER_LIST}`
diff --git a/ui-ci/src/main/resources/ci/scripts/userList.txt b/ui-ci/src/main/resources/ci/scripts/userList.txt
deleted file mode 100644
index 1a2026f291..0000000000
--- a/ui-ci/src/main/resources/ci/scripts/userList.txt
+++ /dev/null
@@ -1 +0,0 @@
-export USER_LIST=( "m99121 DESIGNER Carlos Santana carlos@email.com" "cs0008 DESIGNER Carlos Santana carlos@email.com" "kb0004 TESTER Carlos Santana carlos@email.com" "af0006 OPS Carlos Santana carlos@email.com" "ah0002 GOVERNOR Carlos Santana carlos@email.com" "m08740 DESIGNER Carlos Santana carlos@email.com" "m99124 TESTER Carlos Santana carlos@email.com" "m08743 TESTER Carlos Santana carlos@email.com" "m99123 OPS Carlos Santana carlos@email.com" "m08742 OPS" "m99125 GOVERNOR Carlos Santana carlos@email.com" "m08744 GOVERNOR Carlos Santana carlos@email.com" "m99122 ADMIN Carlos Santana carlos@email.com" "m08741 ADMIN Carlos Santana carlos@email.com" "m99126 PRODUCT_STRATEGIST Carlos Santana carlos@email.com" "m08745 PRODUCT_STRATEGISTCarlos Santana carlos@email.com" "m99127 PRODUCT_MANAGER Carlos Santana carlos@email.com" "m08746 PRODUCT_MANAGER Carlos Santana carlos@email.com" "md9897 DESIGNER Carlos Santana carlos@email.com" "m08748 DESIGNER Carlos Santana carlos@email.com" "m08749 TESTER Carlos Santana carlos@email.com" "be0695 DESIGNER Carlos Santana carlos@email.com" "er434w DESIGNER Carlos Santana carlos@email.com" "ya107f DESIGNER Carlos Santana carlos@email.com" "ds200p DESIGNER Carlos Santana carlos@email.com" "ak0333 ADMIN Carlos Santana carlos@email.com" "th0695 DESIGNER Carlos Santana carlos@email.com" "al714h DESIGNER Carlos Santana carlos@email.com" "ys9693 DESIGNER Carlos Santana carlos@email.com" "ss8214 DESIGNER Carlos Santana carlos@email.com" "bt750h DESIGNER Carlos Santana carlos@email.com" "rp955r DESIGNER Carlos Santana carlos@email.com" "ez6451 DESIGNER Carlos Santana carlos@email.com" "ia901h DESIGNER Carlos Santana carlos@email.com" "ah7840 DESIGNER Carlos Santana carlos@email.com" "ea394r DESIGNER Carlos Santana carlos@email.com" "ms656r DESIGNER Carlos Santana carlos@email.com" "ml636r DESIGNER Carlos Santana carlos@email.com" "it1721 DESIGNER Carlos Santana carlos@email.com" "sg473v DESIGNER Carlos Santana carlos@email.com" "sa997j DESIGNER Carlos Santana carlos@email.com" "az2497 DESIGNER Carlos Santana carlos@email.com" "ys189e DESIGNER Carlos Santana carlos@email.com" "ig642y DESIGNER Carlos Santana carlos@email.com")
\ No newline at end of file