From eaa4414485c85712a5b38986db8e9f854d258c67 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Wed, 12 Jun 2024 20:12:54 -0700
Subject: [PATCH] debug test fail

---
 test_e2e.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test_e2e.sh b/test_e2e.sh
index 18bf83390..e558dcf55 100755
--- a/test_e2e.sh
+++ b/test_e2e.sh
@@ -148,6 +148,7 @@ function docker_run() {
         -d \
         ${RM} \
         --label git-sync-e2e="$RUNID" \
+        --network "e2e_$RUNID" \
         "$@"
     sleep 2 # wait for it to come up
 }
@@ -158,7 +159,8 @@ function docker_ip() {
         echo "usage: $0 <id>"
         return 1
     fi
-    docker inspect "$1" | jq -r .[0].NetworkSettings.IPAddress
+    docker inspect "$1" \
+        | jq -r ".[0].NetworkSettings.Networks.e2e_$RUNID.IPAddress"
 }
 
 function docker_kill() {
@@ -285,7 +287,7 @@ function GIT_SYNC() {
         -i \
         ${RM} \
         --label git-sync-e2e="$RUNID" \
-        --network="host" \
+        --network "e2e_$RUNID" \
         -u git-sync:$(id -g) `# rely on GID, triggering "dubious ownership"` \
         -v "$ROOT":"$ROOT":rw \
         -v "$REPO":"$REPO":ro \
@@ -315,6 +317,7 @@ function remove_containers() {
         | while read CTR; do
             docker kill "$CTR" >/dev/null
         done
+    docker network prune -f >/dev/null
 }
 
 #
@@ -3513,6 +3516,7 @@ function run_test() {
         set -o errexit
         set -o nounset
         set -o pipefail
+        docker network create "e2e_$RUNID" --subnet "192.168.0.0/24"
         "$@"
     )
     eval "$retvar=$?"