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: Remove the dataset indexer images and the indexer.feature + utilize sandbox for algod/indexer/postgres containers #220

Merged
merged 76 commits into from
Aug 22, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
db785d5
remove the dataset indexer images and the indexer.feature
Aug 3, 2022
c2cbeff
ouch - we're not actually doing any real integration tests with indexer
Aug 4, 2022
43c88ac
no evaldelta so no evaldelta tag either
Aug 4, 2022
fcdb7cf
no indexer v23 image, so no fixtures for it either
Aug 4, 2022
5360256
is util/programs actually used?
Aug 4, 2022
5b05096
more prunings
Aug 4, 2022
8e856ff
sandbox seems to work now
Aug 5, 2022
893df2a
remove source +a
Aug 5, 2022
cc73464
sandbox is working (but haven't tried testing)
Aug 5, 2022
b7ec7d2
pin .env to typical values
Aug 5, 2022
f4734e2
yuck... this should have been a python script. sed is platform dependent
Aug 6, 2022
cceed92
try gin
Aug 6, 2022
c0f4b0f
try gin
Aug 6, 2022
97bcf1e
set sandbox node to archival + builtin v1 indexer
Aug 7, 2022
e6d81b6
indexer active + expose sandbox configuration
Aug 7, 2022
6088931
set -e
Aug 7, 2022
ccbf7b2
small revert
Aug 7, 2022
fde71bd
revert
Aug 7, 2022
65710e9
experiiment
Aug 8, 2022
2dd465c
experimental
Aug 8, 2022
7af3ace
experimental cwd
Aug 8, 2022
ae4a250
verbose sandbox + clean up up.sh echos
Aug 9, 2022
c07d95b
clean up
Aug 9, 2022
06c1810
remove `network_config` in response to CR observation
Aug 10, 2022
b30975a
comment about location of network template
Aug 10, 2022
e6658c9
envsubst intead of sed and other improvements
Aug 12, 2022
a3f6689
envsubst intead of sed and other improvements
Aug 12, 2022
017ec80
better comment
Aug 12, 2022
147bea6
remove NODE_V1_INDEXER config capability
Aug 12, 2022
8ba2782
yes, really remove NODE_V1_INDEXER
Aug 12, 2022
ee2198b
default to non-archival node
Aug 12, 2022
318bcb7
deprecated v1 indexer steps
Aug 12, 2022
722ddd1
updated sourcemap
Aug 12, 2022
35751d2
revert
Aug 12, 2022
a39b0de
try gin
Aug 12, 2022
04ad2ed
Update .env
tzaffi Aug 12, 2022
08b8af6
down.sh has hardcoded env file
tzaffi Aug 12, 2022
df0a149
Update scripts/up.sh
tzaffi Aug 12, 2022
11ed449
more slimming
Aug 12, 2022
8ebf91e
clean up the tags in the README
Aug 12, 2022
a73c2c0
oops... we should still be asserting that $TYPE is either channel or …
Aug 12, 2022
03cead5
revert to channel default
Aug 12, 2022
6f1b52c
indexer url was missing
Aug 12, 2022
3366eb6
point sandbox to main branch now that configurable-ports has been merged
Aug 12, 2022
44b5258
don't overwrite sandboxe's SANDBOX_DIR with it's sourcing bugfix in p…
Aug 12, 2022
a3f04af
revert sandbox branch to master after the bugfix was merged
Aug 12, 2022
64894c0
Update scripts/up.sh
tzaffi Aug 16, 2022
4db2f80
Update features/integration/algod.feature
tzaffi Aug 16, 2022
f0e20df
Update features/integration/algod.feature
tzaffi Aug 16, 2022
18b7a70
Update features/integration/algod.feature
tzaffi Aug 16, 2022
686b062
Merge branch 'master' into trim-indexer
tzaffi Aug 16, 2022
9a834fa
per CR: configure verbosity and default to false
Aug 16, 2022
3718bdf
Merge branch 'trim-indexer' of https://github.com/algorand/algorand-s…
Aug 16, 2022
753f51b
per CR suggestion: don't hardcode script name in echo's
Aug 16, 2022
a479075
per CR: don't overwrite sourced variable
Aug 16, 2022
059003a
per CR: more precision in sourcing all
Aug 16, 2022
60a882b
per cr suggestion: -euo pipefail
Aug 16, 2022
98a25e5
per CR: less cruddy time stamps
Aug 16, 2022
8e2bec3
sourcemap duplicate key - fixes tests? -
Aug 16, 2022
ef78e1f
mapping[s]
Aug 16, 2022
ca40915
update diagram
Aug 16, 2022
8ce32e9
less ugly diagrams
Aug 16, 2022
6a847c2
update the README
Aug 16, 2022
eb03dba
revert
Aug 16, 2022
63f0947
introduce sourcemap2.json bc unit/integration compile features are st…
Aug 16, 2022
2378496
sourcemap2 tweak
Aug 16, 2022
3d2db01
Update README.md
tzaffi Aug 16, 2022
e4c6998
per CR suggestion. Show full path of .env
Aug 16, 2022
781bd67
Merge branch 'trim-indexer' of https://github.com/algorand/algorand-s…
Aug 16, 2022
3d71ed4
echo full paths for clarity
Aug 19, 2022
35b5bc5
try and make dryrun_testing.feature var templating COMPLIANT
Aug 21, 2022
d460d1f
oops - try and make dryrun_testing.feature var templating COMPLIANT
Aug 21, 2022
b20f2ef
make the remaining features var templating COMPLIANT
Aug 21, 2022
4f26dbf
Unused Steps Analysis notebook
Aug 22, 2022
c4d9ada
clean up the notebook and use a small sample
Aug 22, 2022
eaf31ff
Merge branch 'master' into trim-indexer
Aug 22, 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
124 changes: 1 addition & 123 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,129 +24,7 @@ services:
- sdk-harness
volumes:
- genesis-file:/genesis-file
tzaffi marked this conversation as resolved.
Show resolved Hide resolved

# Live indexer instance connected to algod
indexer-live:
image: "sdk-harness-indexer-live"
container_name: sdk-harness-indexer-live
build:
context: .
dockerfile: ./docker/indexer/Dockerfile
args:
# allow override of the git information.
URL: "${INDEXER_URL:-https://github.com/algorand/indexer}"
BRANCH: "${INDEXER_BRANCH:-develop}"
ports:
- 60002:8980
restart: unless-stopped
networks:
- sdk-harness
environment:
TYPE: "live"
CONNECTION_STRING: "host=indexer-db port=5432 user=algorand password=harness dbname=live sslmode=disable"
volumes:
- genesis-file:/genesis-file

# Applications Branch using dataset1
indexer-221-1:
image: "sdk-harness-indexer-release"
container_name: sdk-harness-indexer-release
build:
context: .
dockerfile: ./docker/indexer/Dockerfile
args:
URL: "https://github.com/algorand/indexer"
BRANCH: "master"
SHA: "a30878e3669310c30a2b916fb41511516b906c9a"
ports:
- 59999:8980
restart: unless-stopped
networks:
- sdk-harness
environment:
TYPE: "snapshot"
SNAPSHOT_FILE: /tmp/dataset1.tar.bz2
CONNECTION_STRING: "host=indexer-db port=5432 user=algorand password=harness dbname=dataset1 sslmode=disable"

# Applications Branch using dataset2
indexer-221-2:
image: "sdk-harness-indexer-applications"
container_name: sdk-harness-indexer-applications
build:
context: .
dockerfile: ./docker/indexer/Dockerfile
args:
URL: "https://github.com/algorand/indexer"
BRANCH: "master"
SHA: "a30878e3669310c30a2b916fb41511516b906c9a"
ports:
- 59998:8980
restart: unless-stopped
networks:
- sdk-harness
environment:
TYPE: "snapshot"
SNAPSHOT_FILE: /tmp/dataset2.tar.bz2
CONNECTION_STRING: "host=indexer-db port=5432 user=algorand password=harness dbname=dataset2 sslmode=disable"

# Create/Delete/Rewards Branch using dataset1
indexer-23x-1:
image: "sdk-harness-indexer-23x-1"
container_name: sdk-harness-indexer-23x-1
build:
context: .
dockerfile: ./docker/indexer/Dockerfile
args:
URL: "https://github.com/algorand/indexer"
# TODO: Set back to master when include-all makes it to master.
BRANCH: "develop"
SHA: "cf93e3acacdf6fde9afd0b6b24fa0fde723ff43b"
ports:
- 59997:8980
restart: unless-stopped
networks:
- sdk-harness
environment:
TYPE: "snapshot"
SNAPSHOT_FILE: /tmp/dataset1.tar.bz2
CONNECTION_STRING: "host=indexer-db port=5432 user=algorand password=harness dbname=dataset1_2 sslmode=disable"

# Create/Delete/Rewards Branch using dataset2
indexer-23x-2:
image: "sdk-harness-indexer-23x-2"
container_name: sdk-harness-indexer-23x-2
build:
context: .
dockerfile: ./docker/indexer/Dockerfile
args:
URL: "https://github.com/algorand/indexer"
# TODO: Set back to master + SHA when include-all makes it to master.
BRANCH: "develop"
SHA: "cf93e3acacdf6fde9afd0b6b24fa0fde723ff43b"
ports:
- 59996:8980
restart: unless-stopped
networks:
- sdk-harness
environment:
TYPE: "snapshot"
SNAPSHOT_FILE: /tmp/dataset2.tar.bz2
CONNECTION_STRING: "host=indexer-db port=5432 user=algorand password=harness dbname=dataset2_2 sslmode=disable"

indexer-db:
image: "postgres"
container_name: sdk-harness-postgres
volumes:
- ./docker/indexer/init-scripts:/docker-entrypoint-initdb.d
ports:
- 65432:5432
networks:
- sdk-harness
environment:
POSTGRES_USER: algorand
POSTGRES_PASSWORD: harness
POSTGRES_MULTIPLE_DATABASES: live, dataset1, dataset2, dataset1_2, dataset2_2


networks:
sdk-harness:

Expand Down
26 changes: 0 additions & 26 deletions features/integration/evaldelta.feature

This file was deleted.

Loading