From 85e9033ddddcb7af81b3394bc110de61cf422842 Mon Sep 17 00:00:00 2001
From: Franco Bruno Lavayen <cocolavayen@gmail.com>
Date: Wed, 21 Sep 2022 09:42:23 -0300
Subject: [PATCH] [CONSUL-454] Check ports in the Server and Agent containers
 (#65)

---
 test/integration/connect/envoy/run-tests.windows.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/integration/connect/envoy/run-tests.windows.sh b/test/integration/connect/envoy/run-tests.windows.sh
index e4cd8dcbab..f0765a464e 100644
--- a/test/integration/connect/envoy/run-tests.windows.sh
+++ b/test/integration/connect/envoy/run-tests.windows.sh
@@ -150,21 +150,23 @@ function start_consul {
   # 8500/8502 are for consul
   # 9411 is for zipkin which shares the network with consul
   # 16686 is for jaeger ui which also shares the network with consul
-  ports=(
+  server_ports=(
     '-p=8500:8500'
     '-p=8502:8502'
+  )
+  agent_ports=(
     '-p=9411:9411'
     '-p=16686:16686'
   )
   case "$DC" in
     secondary)
-      ports=(
+      server_ports=(
         '-p=9500:8500'
         '-p=9502:8502'
       )
       ;;
     alpha)
-      ports=(
+      server_ports=(
         '-p=9510:8500'
         '-p=9512:8502'
       )
@@ -231,6 +233,7 @@ function start_consul {
       --hostname "consul-${DC}-server" \
       --network-alias "consul-${DC}-server" \
       -e "CONSUL_LICENSE=$license" \
+      ${server_ports[@]} \
       windows/consul:local \
       agent -dev -datacenter "${DC}" \
       -config-dir "C:\\workdir\\${DC}\\consul" \
@@ -245,7 +248,7 @@ function start_consul {
       --hostname "consul-${DC}-client" \
       --network-alias "consul-${DC}-client" \
       -e "CONSUL_LICENSE=$license" \
-      ${ports[@]} \
+      ${agent_ports[@]} \
       windows/consul:local \
       agent -datacenter "${DC}" \
       -config-dir "C:\\workdir\\${DC}\\consul" \
@@ -266,7 +269,7 @@ function start_consul {
       --network-alias "consul-${DC}-client" \
       --network-alias "consul-${DC}-server" \
       -e "CONSUL_LICENSE=$license" \
-      ${ports[@]} \
+      ${server_ports[@]} ${agent_ports[@]} \
       windows/consul:local \
       agent -dev -datacenter "${DC}" \
       -config-dir "C:\\workdir\\${DC}\\consul" \