update docker cleanup

test/e2e/runner/cleanup.go

@@ -11,7 +11,7 @@ import (
 
 // Cleanup removes the Docker Compose containers and testnet directory.
 func Cleanup(testnet *e2e.Testnet) error {
-	err := cleanupDocker()
+	err := cleanupDocker(testnet.Name)
 	if err != nil {
 		return err
 	}
@@ -20,7 +20,7 @@ func Cleanup(testnet *e2e.Testnet) error {
 
 // cleanupDocker removes all E2E resources (with label e2e=True), regardless
 // of testnet.
-func cleanupDocker() error {
+func cleanupDocker(name string) error {
 	logger.Info("Removing Docker containers and networks")
 
 	// GNU xargs requires the -r flag to not run when input is empty, macOS
@@ -28,13 +28,13 @@ func cleanupDocker() error {
 	xargsR := `$(if [[ $OSTYPE == "linux-gnu"* ]]; then echo -n "-r"; fi)`
 
 	err := exec("bash", "-c", fmt.Sprintf(
-		"docker container ls -qa --filter label=e2e | xargs %v docker container rm -f", xargsR))
+		"docker container ls -qa --filter label=\"name=%v\" | xargs %v docker container rm -f", name, xargsR))
 	if err != nil {
 		return err
 	}
 
 	return exec("bash", "-c", fmt.Sprintf(
-		"docker network ls -q --filter label=e2e | xargs %v docker network rm", xargsR))
+		"docker network ls -q --filter label=\"name=%v\"| xargs %v docker network rm", name, xargsR))
 }
 
 // cleanupDir cleans up a testnet directory

test/e2e/runner/main.go

@@ -52,6 +52,9 @@ func NewCLI() *CLI {
 			if err := Cleanup(cli.testnet); err != nil {
 				return err
 			}
+			if !cli.preserve {
+				defer Cleanup(cli.testnet)
+			}
 			if err := Setup(cli.testnet); err != nil {
 				return err
 			}
@@ -103,11 +106,6 @@ func NewCLI() *CLI {
 			if err := Test(cli.testnet); err != nil {
 				return err
 			}
-			if !cli.preserve {
-				if err := Cleanup(cli.testnet); err != nil {
-					return err
-				}
-			}
 			return nil
 		},
 	}
@@ -269,6 +267,8 @@ Does not run any perbutations.
 			if err := Cleanup(cli.testnet); err != nil {
 				return err
 			}
+			defer Cleanup(cli.testnet)
+
 			if err := Setup(cli.testnet); err != nil {
 				return err
 			}
@@ -302,10 +302,6 @@ Does not run any perbutations.
 				return err
 			}
 
-			if err := Cleanup(cli.testnet); err != nil {
-				return err
-			}
-
 			return nil
 		},
 	})

test/e2e/runner/setup.go

@@ -139,6 +139,7 @@ networks:
   {{ .Name }}:
     labels:
       e2e: true
+      name: {{ .Name }}
     driver: bridge
 {{- if .IPv6 }}
     enable_ipv6: true
@@ -153,7 +154,8 @@ services:
   {{ .Name }}:
     labels:
       e2e: true
-    container_name: {{ .Name }}
+      name: {{ $.Name }}
+    container_name: {{$.Name}}_{{ .Name }}
     image: tendermint/e2e-node
 {{- if eq .ABCIProtocol "builtin" }}
     entrypoint: /usr/bin/entrypoint-builtin
@@ -162,10 +164,10 @@ services:
 {{- end }}
     init: true
     ports:
-    - 26656
-    - {{ if .ProxyPort }}{{ addUint32 .ProxyPort 1000 }}:{{ end }}26660
-    - {{ if .ProxyPort }}{{ .ProxyPort }}:{{ end }}26657
-    - 6060
+    - 0:26656
+    - 0:26660
+    - 0:26657
+    - 0:6060
     volumes:
     - ./{{ .Name }}:/tendermint
     networks: