diff --git a/.circleci/config.yml b/.circleci/config.yml index 021cf8b69f..5371536f10 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -374,7 +374,7 @@ jobs: resource_class: medium parallelism: 4 environment: - SKIP_E2E_SUBS: "true" + E2E_TEST_FILTER: "GO" steps: - prepare_go - generic_integration: @@ -387,7 +387,7 @@ jobs: resource_class: medium parallelism: 4 environment: - SKIP_E2E_SUBS: "true" + E2E_TEST_FILTER: "GO" steps: - prepare_go - generic_integration: @@ -399,7 +399,7 @@ jobs: image: ubuntu-2004:202104-01 resource_class: large environment: - E2E_SUBS_ONLY: "true" + E2E_TEST_FILTER: "SCRIPTS" steps: - prepare_go - generic_integration: @@ -411,7 +411,7 @@ jobs: image: ubuntu-2004:202104-01 resource_class: large environment: - E2E_SUBS_ONLY: "true" + E2E_TEST_FILTER: "SCRIPTS" steps: - prepare_go - generic_integration: @@ -459,7 +459,7 @@ jobs: resource_class: arm.medium parallelism: 4 environment: - SKIP_E2E_SUBS: "true" + E2E_TEST_FILTER: "GO" steps: - checkout - prepare_go @@ -473,7 +473,7 @@ jobs: resource_class: arm.medium parallelism: 4 environment: - SKIP_E2E_SUBS: "true" + E2E_TEST_FILTER: "GO" steps: - checkout - prepare_go @@ -486,7 +486,7 @@ jobs: image: ubuntu-2004:202101-01 resource_class: arm.large environment: - E2E_SUBS_ONLY: "true" + E2E_TEST_FILTER: "SCRIPTS" steps: - checkout - prepare_go @@ -499,7 +499,7 @@ jobs: image: ubuntu-2004:202101-01 resource_class: arm.large environment: - E2E_SUBS_ONLY: "true" + E2E_TEST_FILTER: "SCRIPTS" steps: - checkout - prepare_go @@ -558,7 +558,7 @@ jobs: resource_class: medium parallelism: 4 environment: - SKIP_E2E_SUBS: "true" + E2E_TEST_FILTER: "GO" HOMEBREW_NO_AUTO_UPDATE: "true" steps: #- run: git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core fetch --unshallow @@ -574,7 +574,7 @@ jobs: resource_class: medium parallelism: 4 environment: - SKIP_E2E_SUBS: "true" + E2E_TEST_FILTER: "GO" HOMEBREW_NO_AUTO_UPDATE: "true" steps: #- run: git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core fetch --unshallow @@ -589,7 +589,7 @@ jobs: xcode: 12.0.1 resource_class: large environment: - E2E_SUBS_ONLY: "true" + E2E_TEST_FILTER: "SCRIPTS" HOMEBREW_NO_AUTO_UPDATE: "true" steps: #- run: git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core fetch --unshallow @@ -604,7 +604,7 @@ jobs: xcode: 12.0.1 resource_class: large environment: - E2E_SUBS_ONLY: "true" + E2E_TEST_FILTER: "SCRIPTS" HOMEBREW_NO_AUTO_UPDATE: "true" steps: #- run: git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core fetch --unshallow diff --git a/test/scripts/e2e.sh b/test/scripts/e2e.sh index 8a03621493..626bb53dfd 100755 --- a/test/scripts/e2e.sh +++ b/test/scripts/e2e.sh @@ -100,53 +100,50 @@ export GOPATH=$(go env GOPATH) # Change current directory to test/scripts so we can just use ./test.sh to exec. cd "${SCRIPT_PATH}" -if [ "${SKIP_E2E_SUBS}" = "" ]; then +if [ -z $E2E_TEST_FILTER || $E2E_TEST_FILTER="SCRIPTS" ]; then -./timeout 200 ./e2e_basic_start_stop.sh -duration "e2e_basic_start_stop.sh" + ./timeout 200 ./e2e_basic_start_stop.sh + duration "e2e_basic_start_stop.sh" -python3 -m venv "${TEMPDIR}/ve" -. "${TEMPDIR}/ve/bin/activate" -"${TEMPDIR}/ve/bin/pip3" install --upgrade pip -"${TEMPDIR}/ve/bin/pip3" install --upgrade py-algorand-sdk cryptography -duration "e2e client setup" + python3 -m venv "${TEMPDIR}/ve" + . "${TEMPDIR}/ve/bin/activate" + "${TEMPDIR}/ve/bin/pip3" install --upgrade pip + "${TEMPDIR}/ve/bin/pip3" install --upgrade py-algorand-sdk cryptography + duration "e2e client setup" -"${TEMPDIR}/ve/bin/python3" e2e_client_runner.py ${RUN_KMD_WITH_UNSAFE_SCRYPT} "$SRCROOT"/test/scripts/e2e_subs/*.sh -duration "parallel client runner" + "${TEMPDIR}/ve/bin/python3" e2e_client_runner.py ${RUN_KMD_WITH_UNSAFE_SCRYPT} "$SRCROOT"/test/scripts/e2e_subs/*.sh + duration "parallel client runner" -for vdir in "$SRCROOT"/test/scripts/e2e_subs/v??; do - "${TEMPDIR}/ve/bin/python3" e2e_client_runner.py ${RUN_KMD_WITH_UNSAFE_SCRYPT} --version "$(basename "$vdir")" "$vdir"/*.sh -done -duration "vdir client runners" - -for script in "$SRCROOT"/test/scripts/e2e_subs/serial/*; do - "${TEMPDIR}/ve/bin/python3" e2e_client_runner.py ${RUN_KMD_WITH_UNSAFE_SCRYPT} $script -done -duration "serial client runners" + for vdir in "$SRCROOT"/test/scripts/e2e_subs/v??; do + "${TEMPDIR}/ve/bin/python3" e2e_client_runner.py ${RUN_KMD_WITH_UNSAFE_SCRYPT} --version "$(basename "$vdir")" "$vdir"/*.sh + done + duration "vdir client runners" -deactivate + for script in "$SRCROOT"/test/scripts/e2e_subs/serial/*; do + "${TEMPDIR}/ve/bin/python3" e2e_client_runner.py ${RUN_KMD_WITH_UNSAFE_SCRYPT} $script + done + duration "serial client runners" -fi # if $SKIP_E2E_SUBS = "" + deactivate +fi # if E2E_TEST_FILTER = "" or = "SCRIPTS" -if [ "${E2E_SUBS_ONLY}" != "" ]; then - exit 0 -fi +if [ -z $E2E_TEST_FILTER || $E2E_TEST_FILTER="GO" ]; then + # Export our root temp folder as 'TESTDIR' for tests to use as their root test folder + # This allows us to clean up everything with our rm -rf trap. + export TESTDIR=${TEMPDIR} + export TESTDATADIR=${SRCROOT}/test/testdata + export SRCROOT=${SRCROOT} -# Export our root temp folder as 'TESTDIR' for tests to use as their root test folder -# This allows us to clean up everything with our rm -rf trap. -export TESTDIR=${TEMPDIR} -export TESTDATADIR=${SRCROOT}/test/testdata -export SRCROOT=${SRCROOT} + ./e2e_go_tests.sh ${GO_TEST_ARGS} + duration "e2e_go_tests.sh" -./e2e_go_tests.sh ${GO_TEST_ARGS} -duration "e2e_go_tests.sh" + rm -rf "${TEMPDIR}" -rm -rf "${TEMPDIR}" - -if ! ${NO_BUILD} ; then - rm -rf ${PKG_ROOT} -fi + if ! ${NO_BUILD} ; then + rm -rf ${PKG_ROOT} + fi -echo "----------------------------------------------------------------------" -echo " DONE: E2E" -echo "----------------------------------------------------------------------" + echo "----------------------------------------------------------------------" + echo " DONE: E2E" + echo "----------------------------------------------------------------------" +fi # if E2E_TEST_FILTER = "" or = "GO"