summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeph Grunschlag <zeph@algorand.com>2022-08-02 21:21:37 -0500
committerZeph Grunschlag <zeph@algorand.com>2022-08-02 21:21:37 -0500
commit9029cda3f0dba9df2fdf7b0f3f2eeaa63e2d209f (patch)
treed7e9398ecb01475a1bf7c0543c54408ef840f882
parentf140a9785337ae176a8629f9f9e462ce6c7a8b23 (diff)
update variable usagetzaffi/box-e2e-improvements
-rw-r--r--.circleci/config.yml9
-rw-r--r--Makefile3
2 files changed, 6 insertions, 6 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index b42a56ab5..e2b0f684e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -418,10 +418,11 @@ commands:
export PARTITION_TOTAL=${CIRCLE_NODE_TOTAL}
export PARTITION_ID=${CIRCLE_NODE_INDEX}
export PARALLEL_FLAG="-p 1"
- # TODO: the next 3 are temporary
- export FORCE_KEEP_TEMPS=1
- export E2E_TEST_FILTER=SCRIPTS
- export AWS_NET_UPLOAD=znet_done.tar.bz2
+ # TODO: this black through *.sh is temporary. DO NOT MERGE!!!
+ # export FORCE_KEEP_TEMPS=1 # merge got rid of this usage
+ # CI_KEEP_TEMP_PLATFORM=????
+ # export E2E_TEST_FILTER=SCRIPTS
+ # export CI_E2E_FILENAME=znet_done
test/scripts/run_integration_tests.sh
- store_artifacts:
diff --git a/Makefile b/Makefile
index 271f6cba6..1c671945c 100644
--- a/Makefile
+++ b/Makefile
@@ -257,9 +257,8 @@ fulltest: build-race
shorttest: build-race
$(GOTESTCOMMAND) $(GOTAGS) -short -race $(UNIT_TEST_SOURCES) -timeout 1h -coverprofile=coverage.txt -covermode=atomic
-# TODO: DO NOT MERGE THIS CHANGE:
integration: build-race
- E2E_TEST_FILTER=SCRIPTS FORCE_KEEP_TEMPS=1 AWS_NET_UPLOAD=znet_done.tar.bz2 ./test/scripts/run_integration_tests.sh
+ ./test/scripts/run_integration_tests.sh
testall: fulltest integration