Merge pull request #328 from wso2/scenario-dir

Update test.sh
wso2-attic · Mar 21, 2019 · a9ae1d6 · a9ae1d6
2 parents a76a598 + 42bb209
commit a9ae1d6
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/integration-tests/test.sh b/integration-tests/test.sh
@@ -171,9 +171,9 @@ if [ "${os}" = "Windows" ]; then
   sshpass -p "${password}" ssh -o StrictHostKeyChecking=no ${user}@${host} "${REM_DIR}/${FILE7}" ${REM_DIR}
   echo "=== End of execution ==="
   echo "Retrieving reports from instance.. "
-  mkdir -p ${OUTPUTS_DIR}/integration-tests/scenarios
-  echo $(sshpass -p "${password}" scp -r -q -o StrictHostKeyChecking=no ${user}@${host}:${REM_DIR}/product-is/modules/integration/tests-integration/tests-backend/target/surefire-reports ${OUTPUTS_DIR}/integration-tests/scenarios)
-  echo $(sshpass -p "${password}" scp -q -o StrictHostKeyChecking=no ${user}@${host}:${REM_DIR}/product-is/modules/integration/tests-integration/tests-backend/target/logs/automation.log ${OUTPUTS_DIR}/integration-tests/scenarios)
+  mkdir -p ${OUTPUTS_DIR}/scenarios/integration-tests
+  echo $(sshpass -p "${password}" scp -r -q -o StrictHostKeyChecking=no ${user}@${host}:${REM_DIR}/product-is/modules/integration/tests-integration/tests-backend/target/surefire-reports ${OUTPUTS_DIR}/scenarios/integration-tests/)
+  echo $(sshpass -p "${password}" scp -q -o StrictHostKeyChecking=no ${user}@${host}:${REM_DIR}/product-is/modules/integration/tests-integration/tests-backend/target/logs/automation.log ${OUTPUTS_DIR}/scenarios/integration-tests/)
   echo $(sshpass -p "${password}" scp -q -o StrictHostKeyChecking=no ${user}@${host}:${REM_DIR}/output.properties ${OUTPUTS_DIR}/integration-tests/scenarios)
   echo "=== Reports retrieved successfully ==="
   set -o xtrace
@@ -196,11 +196,11 @@ else
 
   ssh -o StrictHostKeyChecking=no -i ${key_pem} ${user}@${host} bash ${REM_DIR}/intg-test-runner.sh --wd ${REM_DIR}
 
-  mkdir -p ${OUTPUTS_DIR}/integration-tests/scenarios
+  mkdir -p ${OUTPUTS_DIR}/scenarios/integration-tests
   #Get the reports from integration test
-  scp -o StrictHostKeyChecking=no -r -i ${key_pem} ${user}@${host}:${REM_DIR}/product-is/modules/integration/tests-integration/tests-backend/target/surefire-reports ${OUTPUTS_DIR}/integration-tests/scenarios
-  scp -o StrictHostKeyChecking=no -r -i ${key_pem} ${user}@${host}:${REM_DIR}/product-is/modules/integration/tests-integration/tests-backend/target/logs/automation.log ${OUTPUTS_DIR}/integration-tests/scenarios
-  scp -o StrictHostKeyChecking=no -r -i ${key_pem} ${user}@${host}:${REM_DIR}/output.properties ${OUTPUTS_DIR}/integration-tests/scenarios
+  scp -o StrictHostKeyChecking=no -r -i ${key_pem} ${user}@${host}:${REM_DIR}/product-is/modules/integration/tests-integration/tests-backend/target/surefire-reports ${OUTPUTS_DIR}/scenarios/integration-tests/
+  scp -o StrictHostKeyChecking=no -r -i ${key_pem} ${user}@${host}:${REM_DIR}/product-is/modules/integration/tests-integration/tests-backend/target/logs/automation.log ${OUTPUTS_DIR}/scenarios/integration-tests/
+  scp -o StrictHostKeyChecking=no -r -i ${key_pem} ${user}@${host}:${REM_DIR}/output.properties ${OUTPUTS_DIR}/scenarios/integration-tests/
   echo "=== Reports are copied success ==="
 fi
 ##script ends