Make keep containers configurable

e2e/sample.config.yaml

@@ -24,7 +24,7 @@ activeRelayer: hermes # override with RELAYER_ID
 relayers:
   - id: hermes
     image: ghcr.io/informalsystems/hermes
-    tag: "v1.7.0"
+    tag: "1.10.0"
   - id: rly
     image: ghcr.io/cosmos/relayer
     tag: "latest"
@@ -38,6 +38,8 @@ cometbft:
 debug:
   # setting this value to true will force log collection even if the test passes.
   dumpLogs: false
+  # settings this value to true will keep the containers running after the test finishes.
+  keepContainers: true
 
 # Required only for upgrade tests.
 # Chain A will be upgraded the specified tag.

e2e/testsuite/testconfig.go

@@ -52,6 +52,10 @@ const (
 	ChainUpgradePlanEnv = "CHAIN_UPGRADE_PLAN"
 	// E2EConfigFilePathEnv allows you to specify a custom path for the config file to be used.
 	E2EConfigFilePathEnv = "E2E_CONFIG_PATH"
+	// KeepContainersEnv instructs interchaintest to not delete the containers after a test has run.
+	// this ensures that chain containers are not deleted after a test suite is run if other tests
+	// depend on those chains.
+	KeepContainersEnv = "KEEP_CONTAINERS"
 
 	// defaultBinary is the default binary that will be used by the chains.
 	defaultBinary = "simd"
@@ -297,6 +301,11 @@ type DebugConfig struct {
 
 	// GenesisDebug contains debug information specific to Genesis.
 	GenesisDebug GenesisDebugConfig `yaml:"genesis"`
+
+	// KeepContainers specifies if the containers should be kept after the test suite is done.
+	// NOTE: when running a full test suite, this value should be set to true in order to preserve
+	// shared resources.
+	KeepContainers bool `yaml:"keepContainers"`
 }
 
 // LoadConfig attempts to load a atest configuration from the default file path.
@@ -372,6 +381,10 @@ func applyEnvironmentVariableOverrides(fromFile TestConfig) TestConfig {
 		fromFile.UpgradeConfig.Tag = envTc.UpgradeConfig.Tag
 	}
 
+	if isEnvTrue(KeepContainersEnv) {
+		fromFile.DebugConfig.KeepContainers = true
+	}
+
 	return fromFile
 }
 
@@ -513,12 +526,16 @@ func GetChainBTag() string {
 // if the tests are running locally.
 // Note: github actions passes a CI env value of true by default to all runners.
 func IsCI() bool {
-	return strings.ToLower(os.Getenv("CI")) == "true"
+	return isEnvTrue("CI")
 }
 
 // IsFork returns true if the tests are running in fork mode, false is returned otherwise.
 func IsFork() bool {
-	return strings.ToLower(os.Getenv("FORK")) == "true"
+	return isEnvTrue("FORK")
+}
+
+func isEnvTrue(env string) bool {
+	return strings.ToLower(os.Getenv(env)) == "true"
 }
 
 // ChainOptions stores chain configurations for the chains that will be

e2e/testsuite/testsuite.go

@@ -166,7 +166,9 @@ func (s *E2ETestSuite) initalizeRelayerPool(n int) []ibc.Relayer {
 func (s *E2ETestSuite) SetupChains(ctx context.Context, channelOptionsModifier ChainOptionModifier, chainSpecOpts ...ChainOptionConfiguration) {
 	s.T().Logf("Setting up chains: %s", s.T().Name())
 
-	s.Require().NoError(os.Setenv("KEEP_CONTAINERS", "true"))
+	if LoadConfig().DebugConfig.KeepContainers {
+		s.Require().NoError(os.Setenv(KeepContainersEnv, "true"))
+	}
 
 	s.initState()
 	s.configureGenesisDebugExport()