Skip to content

Commit

Permalink
fix(e2e): Use docker compose V2 for kvtool and Makefile (#1990)
Browse files Browse the repository at this point in the history
* chore(Makefile): Migrate to docker compose v2

Use V2 `docker compose` instead of V1 `docker-compose`

* chore(kvtool): Update to latest master commit
  • Loading branch information
nddeluca authored Aug 2, 2024
1 parent bbfaa54 commit e198eeb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,10 @@ build-docker-local-kava:
# Run a 4-node testnet locally
localnet-start: build-linux localnet-stop
@if ! [ -f build/node0/kvd/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/kvd:Z kava/kavanode testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; fi
docker-compose up -d
$(DOCKER) compose up -d

localnet-stop:
docker-compose down
$(DOCKER) compose down

# Launch a new single validator chain
start:
Expand Down Expand Up @@ -346,7 +346,7 @@ start-remote-sims:
# submit an array job on AWS Batch, using 1000 seeds, spot instances
aws batch submit-job \
-β€”job-name "master-$(VERSION)" \
-β€”job-queue β€œsimulation-1-queue-spot" \
-β€”job-queue "simulation-1-queue-spot" \
-β€”array-properties size=1000 \
-β€”job-definition kava-sim-master \
-β€”container-override environment=[{SIM_NAME=master-$(VERSION)}]
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/kvtool
Submodule kvtool updated 33 files
+1 βˆ’0 .tool-versions
+2 βˆ’2 README.md
+138 βˆ’28 cmd/testnet/bootstrap.go
+1 βˆ’1 cmd/testnet/dc.go
+188 βˆ’0 cmd/testnet/docker.go
+1 βˆ’1 cmd/testnet/down.go
+2 βˆ’2 cmd/testnet/export.go
+5 βˆ’5 cmd/testnet/root.go
+3 βˆ’0 cmd/testnet/service_names.go
+2 βˆ’2 cmd/testnet/up.go
+1 βˆ’0 config/generate/genesis/evm.params.enabled_precompiles.json
+22 βˆ’0 config/generate/genesis/evmutil.accounts.json
+11 βˆ’3 config/generate/genesis/generate-kava-genesis.sh
+1 βˆ’1 config/templates/ibcchain/master/docker-compose.yaml
+368 βˆ’11 config/templates/ibcchain/master/initstate/.kava/config/genesis.json
+19 βˆ’8 config/templates/kava/master/initstate/.kava/config/app.toml
+2 βˆ’2 config/templates/kava/master/initstate/.kava/config/client.toml
+44 βˆ’23 config/templates/kava/master/initstate/.kava/config/config.toml
+64 βˆ’31 config/templates/kava/master/initstate/.kava/config/genesis.json
+1 βˆ’1 config/templates/kava/master/initstate/.kava/config/gentx/gentx-461d9761df5db0a112407ca8a82f1774ef2dbaa3.json
+1 βˆ’1 config/templates/kava/pruning-node/readme.md
+1 βˆ’1 config/templates/kava/v0.26/docker-compose.yaml
+2 βˆ’2 config/templates/kava/v0.26/initstate/.kava/config/client.toml
+6 βˆ’0 config/templates/kava/v0.26/initstate/.kava/config/genesis.json
+7 βˆ’7 config/templates/relayer/readme.md
+1 βˆ’1 contrib/issue-stake-liquify/readme.md
+1 βˆ’0 contrib/update-genesis-validators/.gitignore
+3,619 βˆ’0 contrib/update-genesis-validators/cmd/test/test_genesis.json
+2 βˆ’35 contrib/update-genesis-validators/cmd/update_genesis_validators.go
+163 βˆ’0 contrib/update-genesis-validators/cmd/update_god_committee.go
+189 βˆ’0 contrib/update-genesis-validators/cmd/update_god_committee_test.go
+37 βˆ’26 contrib/update-genesis-validators/go.mod
+63 βˆ’55 contrib/update-genesis-validators/go.sum

0 comments on commit e198eeb

Please sign in to comment.