update scripts

tests/aws-test/build-aws/prepare-dist.sh

@@ -29,9 +29,5 @@ if [ ! -e requirements_dev.txt ]; then
 else
     cp requirements_dev.txt tests/aws-test/build-aws/requirements.txt
 fi
-cp  -r tests/aws-test "${INTEGRATION_TEST_OUTPUT_DIR}"
-cp  -r tests/integration "${INTEGRATION_TEST_OUTPUT_DIR}"
-cp  -r tests/dependencies "${INTEGRATION_TEST_OUTPUT_DIR}"
-cp  -r tests/performance "${INTEGRATION_TEST_OUTPUT_DIR}"
-cp -r tests/unit "${INTEGRATION_TEST_OUTPUT_DIR}"
+cp  -r tests "${INTEGRATION_TEST_OUTPUT_DIR}"
 cp -r wdms_client "${INTEGRATION_TEST_OUTPUT_DIR}"
\ No newline at end of file

tests/aws-test/build-aws/run-tests.sh

@@ -14,7 +14,7 @@
 
 # This script executes the test and copies reports to the provided output directory
 # To call this script from the service working directory
-# ./dist/testing/integration/build-aws/run-tests.sh "./reports/"
+# ./dist/testing/tests/integration/build-aws/run-tests.sh "./reports/"
 echo '********* Running Wellbore DDMS integration tests  *********'
 
 SCRIPT_SOURCE_DIR=$(dirname "$0")
@@ -38,15 +38,15 @@ token=$(aws cognito-idp initiate-auth --auth-flow USER_PASSWORD_AUTH --client-id
 #### RUN INTEGRATION TEST #########################################################################
 
 
-pushd "$SCRIPT_SOURCE_DIR"/../../
+pushd "$SCRIPT_SOURCE_DIR"/../../../
 echo $(pwd)
 python3 -m venv env
 source env/bin/activate
-python3 -m pip install -r ./aws-test/build-aws/requirements.txt
+python3 -m pip install -r ./tests/aws-test/build-aws/requirements.txt
 rm -rf test-reports/
 mkdir test-reports
 
-cd integration
+cd tests/integration
 acl_domain='example.com'
 legal_tag='opendes-sdmstestlegaltag'