From 7c1f7998bc7f01a42d83567a3502e18b01e466a6 Mon Sep 17 00:00:00 2001 From: Alex Gartner Date: Thu, 20 Jun 2024 14:40:40 -0700 Subject: [PATCH] add ZETACORED_START_PERIOD and allow user to set E2E_ARGS --- Makefile | 7 ++++--- contrib/localnet/docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b71c66dfb6..f36dc3bc3d 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,10 @@ HSM_BUILD_FLAGS := -tags pebbledb,ledger,hsm_test export DOCKER_BUILDKIT := 1 # set defaults to empty to prevent docker warning -export LOCALNET_MODE := "" -export E2E_ARGS := "" -export UPGRADE_HEIGHT := "" +export LOCALNET_MODE +export E2E_ARGS := $(E2E_ARGS) +export UPGRADE_HEIGHT +export ZETACORED_START_PERIOD := 30s clean: clean-binaries clean-dir clean-test-dir clean-coverage diff --git a/contrib/localnet/docker-compose.yml b/contrib/localnet/docker-compose.yml index ceea25ba7f..5474dd66a7 100644 --- a/contrib/localnet/docker-compose.yml +++ b/contrib/localnet/docker-compose.yml @@ -44,7 +44,7 @@ services: interval: 30s timeout: 10s retries: 3 - start_period: 30s + start_period: ${ZETACORED_START_PERIOD} start_interval: 1s networks: mynetwork: