fix topo use in local_example

.github/workflows/local_example.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: gh-hosted-runners-16cores-1-24.04
     strategy:
       matrix:
-        topo: [consul,etcd,zk2]
+        topo: [etcd,zk2]
 
     steps:
     - name: Skip CI

docker/test/run.sh

@@ -141,6 +141,10 @@ args="$args -v /tmp/mavencache:/home/vitess/.m2"
 args="$args --user vitess"
 args="$args -v $PWD/test/bin:/tmp/bin"
 
+# Pass through TOPO environment variable if it's set
+if [[ -n "$TOPO" ]]; then
+  args="$args -e TOPO=$TOPO"
+fi
 # Mount in host VTDATAROOT if one exists, since it might be a RAM disk or SSD.
 if [[ -n "$VTDATAROOT" ]]; then
   hostdir=`mktemp -d $VTDATAROOT/test-XXX`

examples/common/scripts/zk-down.sh

@@ -18,6 +18,10 @@
 
 source "$(dirname "${BASH_SOURCE[0]:-$0}")/../env.sh"
 
+# Explicitly set VTROOT for this script, since it requires it.
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+export VTROOT=${VTROOT:-$(cd "$SCRIPT_DIR/../../.." && pwd)}
+
 # Stop ZooKeeper servers.
 echo "Stopping zk servers..."
 for zkid in $zkids; do

examples/common/scripts/zk-up.sh

@@ -18,6 +18,10 @@
 
 source "$(dirname "${BASH_SOURCE[0]:-$0}")/../env.sh"
 
+# Explicitly set VTROOT for this script, since it requires it.
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+export VTROOT=${VTROOT:-$(cd "$SCRIPT_DIR/../../.." && pwd)}
+
 cell=${CELL:-'test'}
 # Start ZooKeeper servers.
 # The "zkctl init" command won't return until the server is able to contact its

test.go

@@ -222,6 +222,7 @@ func (t *Test) run(dir, dataDir string) ([]byte, error) {
 		"VTROOT":      "/vt/src/vitess.io/vitess",
 		"VTDATAROOT":  dataDir,
 		"VTPORTSTART": strconv.FormatInt(int64(getPortStart(100)), 10),
+		"TOPO":        os.Getenv("TOPO"),
 	})
 
 	// Capture test output.