Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement: update e2e test policy #1197

Merged
merged 29 commits into from
Sep 2, 2022
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f169b6f
update CI config
shiqizng Aug 19, 2022
6916fe9
set env var
shiqizng Aug 19, 2022
602a580
update docker env var
shiqizng Aug 22, 2022
b000965
update makefile
shiqizng Aug 22, 2022
c239629
update docker env var name
shiqizng Aug 22, 2022
0938769
update ci configs
shiqizng Aug 23, 2022
d28b52e
rm files
shiqizng Aug 23, 2022
3b8956e
Revert "update docker env var name"
shiqizng Aug 23, 2022
e2e96b0
Revert "update ci configs"
shiqizng Aug 23, 2022
696379e
update ci configs
shiqizng Aug 23, 2022
ff03e01
update docker env var name
shiqizng Aug 23, 2022
c7fe986
update test data build script
shiqizng Aug 23, 2022
3737c72
update e2e test data file path
shiqizng Aug 26, 2022
f7556ba
test file version
shiqizng Aug 26, 2022
e3b8933
update submodule, makefile
shiqizng Aug 31, 2022
3f510b9
pin submodule to rel/nightly
shiqizng Aug 31, 2022
f352a6a
revert buildtestdata changes
shiqizng Aug 31, 2022
e683351
fmt, go mod
shiqizng Aug 31, 2022
f1121fd
update makefile
shiqizng Aug 31, 2022
e966a88
update git module configs
shiqizng Aug 31, 2022
2fe1aba
pin e2e test to submodule version
shiqizng Sep 2, 2022
ca68527
Revert "pin e2e test to submodule version"
shiqizng Sep 2, 2022
4ffa353
add ci env var
shiqizng Sep 2, 2022
7087a8e
update ci env var, comment
shiqizng Sep 2, 2022
e4dc8dd
update s3 file download
shiqizng Sep 2, 2022
cd8bda6
fix failing test
shiqizng Sep 2, 2022
a6cfc15
update tarpath
shiqizng Sep 2, 2022
b9601ea
remove debug line
shiqizng Sep 2, 2022
19c72e0
update misc/readme
shiqizng Sep 2, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ jobs:
parameters:
go_version:
type: string
environment:
CI_E2E_FILENAME: "net_done"
shiqizng marked this conversation as resolved.
Show resolved Hide resolved
steps:
- go/install:
version: << parameters.go_version >>
Expand All @@ -57,6 +59,8 @@ jobs:
parameters:
go_version:
type: string
environment:
CI_E2E_FILENAME: "rel-nightly"
steps:
- go/install:
version: << parameters.go_version >>
Expand All @@ -82,6 +86,7 @@ jobs:
image: << pipeline.parameters.ubuntu_image >>
steps:
- install_dependencies
- update_submodules
- run_indexer_vs_algod
- slack/notify: &slack-fail-event
event: fail
Expand Down Expand Up @@ -115,14 +120,18 @@ commands:
name: sync submodules (go-algorand)
command: |
git submodule sync
git submodule update --init

- run: echo 'export PATH=$PATH:/usr/local/go/bin' >> $BASH_ENV

- run:
- run:
name: Install golint
command: go install golang.org/x/lint/golint@latest

update_submodules:
description: get latst submodule (go-algorand) updates
steps:
- run: git submodule update -init

run_tests:
steps:
- run: test -z `go fmt ./...`
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ integration: cmd/algorand-indexer/algorand-indexer
test/postgres_integration_test.sh

e2e: cmd/algorand-indexer/algorand-indexer
cd misc && docker-compose build --build-arg GO_IMAGE=${GO_IMAGE} && docker-compose up --exit-code-from e2e
cd misc && docker-compose build --build-arg GO_IMAGE=${GO_IMAGE} && TEST_FILENAME=${CI_E2E_FILENAME} docker-compose up --exit-code-from e2e

deploy:
mule/deploy.sh
Expand Down
4 changes: 2 additions & 2 deletions misc/buildtestdata.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# python3 -m venv ve3
# ve3/bin/pip install py-algorand-sdk
# . ve3/bin/activate
# ./misc/buildtestdata.sh
# ./misc/buildtestdata.sh <filename>

set -x
set -e
Expand Down Expand Up @@ -49,4 +49,4 @@ mkdir -p "${E2EDATA}"
RSTAMP=$(TZ=UTC python -c 'import time; print("{:08x}".format(0xffffffff - int(time.time() - time.mktime((2020,1,1,0,0,0,-1,-1,-1)))))')

echo "COPY AND PASTE THIS TO UPLOAD:"
shiqizng marked this conversation as resolved.
Show resolved Hide resolved
echo aws s3 cp --acl public-read "${E2EDATA}/net_done.tar.bz2" s3://algorand-testdata/indexer/e2e4/"${RSTAMP}"/net_done.tar.bz2
aws s3 cp --acl public-read "${E2EDATA}/net_done.tar.bz2" s3://algorand-testdata/indexer/e2e4/"${RSTAMP}"/$1
2 changes: 1 addition & 1 deletion misc/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
dockerfile: ./misc/Dockerfile
environment:
CONNECTION_STRING: "host=e2e-db port=5432 user=algorand password=algorand dbname=indexer_db sslmode=disable"
CI_E2E_FILENAME: "rel-nightly"
CI_E2E_FILENAME: "${TEST_FILENAME}"

e2e-db:
image: "postgres:13-alpine"
Expand Down