Cherry-pick 1a9119d with conflicts

vitessio · Nov 7, 2023 · c21c77e · c21c77e
1 parent 8bb4f58
commit c21c77e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml
@@ -8,8 +8,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+<<<<<<< HEAD
         os: [ubuntu-22.04]
         topo: [consul,etcd,k8s]
+=======
+        topo: [consul,etcd,zk2]
+>>>>>>> 1a9119d089 (examples: fix flag syntax for zkctl (#14469))
 
     steps:
     - name: Skip CI

diff --git a/examples/common/scripts/zk-down.sh b/examples/common/scripts/zk-down.sh
@@ -21,6 +21,6 @@ source "$(dirname "${BASH_SOURCE[0]:-$0}")/../env.sh"
 # Stop ZooKeeper servers.
 echo "Stopping zk servers..."
 for zkid in $zkids; do
-  zkctl -zk.myid $zkid -zk.cfg $zkcfg -log_dir $VTDATAROOT/tmp shutdown
+  zkctl --zk.myid $zkid --zk.cfg $zkcfg --log_dir $VTDATAROOT/tmp shutdown
 done
 
diff --git a/examples/common/scripts/zk-up.sh b/examples/common/scripts/zk-up.sh
@@ -19,7 +19,6 @@
 source "$(dirname "${BASH_SOURCE[0]:-$0}")/../env.sh"
 
 cell=${CELL:-'test'}
-
 # Start ZooKeeper servers.
 # The "zkctl init" command won't return until the server is able to contact its
 # peers, so we need to start them all in the background and then wait for them.
@@ -32,7 +31,7 @@ for zkid in $zkids; do
     echo "    $VTDATAROOT/$zkdir"
     action='start'
   fi
-  zkctl -zk.myid $zkid -zk.cfg $zkcfg -log_dir $VTDATAROOT/tmp $action \
+  zkctl --zk.myid $zkid --zk.cfg $zkcfg --log_dir $VTDATAROOT/tmp $action \
     > $VTDATAROOT/tmp/zkctl_$zkid.out 2>&1 &
   pids[$zkid]=$!
 done