e2e: set algod version and default values (#1560)

* config algod channel and set default test env values

---------

Co-authored-by: Will Winder <[email protected]>

.circleci/config.yml

@@ -46,15 +46,18 @@ jobs:
       go_version:
         type: string
     environment:
+      # A stable environment for PRs.
+      # Set CHANNEL to nightly and update CI_E2E_FILENAME when adding a new feature.
+      # Change back to stable once the new feature is released.
       CI_E2E_FILENAME: "f99e7b0c/rel-nightly"
+      CHANNEL: nightly
     steps:
       - go/install:
           version: << parameters.go_version >>
       - install_dependencies
       - install_linter
       - run_tests
-      # Change this to run_e2e_tests once we have stable algod binaries containing delta APIs
-      - run_e2e_tests_nightly
+      - run_e2e_tests
       - codecov/upload
 
   test_nightly:
@@ -65,6 +68,7 @@ jobs:
         type: string
     environment:
       CI_E2E_FILENAME: "rel-nightly"
+      CHANNEL: nightly
     steps:
       - go/install:
           version: << parameters.go_version >>
@@ -134,7 +138,6 @@ commands:
           command: go install github.com/golangci/golangci-lint/cmd/[email protected]
 
   run_e2e_tests:
-    # no "-nightly" in final 2 steps
     steps:
       - run:
           name: Install go-algorand stable binaries
@@ -154,8 +157,8 @@ commands:
             wget https://raw.githubusercontent.com/algorand/go-algorand/rel/stable/cmd/updater/update.sh && chmod 744 update.sh
             ./update.sh -i -c nightly -n -d ./ -p /usr/local/go/bin
             export GOPATH=/usr/local/go/
-      - run: make e2e-nightly
-      - run: make e2e-filter-test-nightly
+      - run: make e2e
+      - run: make e2e-filter-test
 
   run_tests:
     steps:

Makefile

@@ -47,8 +47,6 @@ lint:
 fmt:
 	go fmt ./...
 
-# note: when running e2e tests manually be sure to set the e2e filename:
-# 	'export CI_E2E_FILENAME=rel-nightly'
 # To keep the container running at exit set 'export EXTRA="--keep-alive"',
 # once the container is paused use 'docker exec <id> bash' to inspect temp
 # files in `/tmp/*/'
@@ -58,12 +56,6 @@ e2e: cmd/algorand-indexer/algorand-indexer
 e2e-filter-test: cmd/algorand-indexer/algorand-indexer
 	cd e2e_tests/docker/indexer-filtered/ && docker-compose build --build-arg GO_IMAGE=${GO_IMAGE} && docker-compose up --exit-code-from e2e-read
 
-e2e-filter-test-nightly: cmd/algorand-indexer/algorand-indexer
-	cd e2e_tests/docker/indexer-filtered/ && docker-compose build --build-arg GO_IMAGE=${GO_IMAGE} --build-arg CHANNEL=nightly && docker-compose up --exit-code-from e2e-read
-
-e2e-nightly: cmd/algorand-indexer/algorand-indexer
-	cd e2e_tests/docker/indexer/ && docker-compose build --build-arg GO_IMAGE=${GO_IMAGE} --build-arg CHANNEL=nightly && docker-compose up --exit-code-from e2e
-
 deploy:
 	mule/deploy.sh
 

e2e_tests/docker/indexer/Dockerfile

@@ -1,4 +1,4 @@
-ARG GO_IMAGE=golang:1.14.7
+ARG GO_IMAGE=golang:1.20.5
 FROM $GO_IMAGE
 ARG CHANNEL=stable
 

e2e_tests/docker/indexer/docker-compose.yml

@@ -5,9 +5,11 @@ services:
     build:
       context: ../../../.
       dockerfile: ./e2e_tests/docker/indexer/Dockerfile
+      args:
+        CHANNEL: "${CHANNEL:-stable}"
     environment:
       CONNECTION_STRING: "host=e2e-db port=5432 user=algorand password=algorand dbname=indexer_db sslmode=disable"
-      CI_E2E_FILENAME: "${CI_E2E_FILENAME}"
+      CI_E2E_FILENAME: "${CI_E2E_FILENAME:-rel-nightly}"
       # Add --keep-alive to this variable to pause the container on an error
       EXTRA: "${EXTRA}"