Merge 426b138 into backport/rboyer/update-deployer-default-images/smo…

…othly-brief-wombat
hashicorp · Nov 7, 2023 · 8cb45dc · 8cb45dc
2 parents d066023 + 426b138
commit 8cb45dc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 42 deletions.
diff --git a/test-integ/catalogv2/explicit_destinations_test.go b/test-integ/catalogv2/explicit_destinations_test.go
@@ -108,7 +108,7 @@ func (c testBasicL4ExplicitDestinationsCreator) NewConfig(t *testing.T) *topolog
 	}
 
 	return &topology.Config{
-		Images: topoutil.TargetImages(),
+		Images: utils.TargetImages(),
 		Networks: []*topology.Network{
 			{Name: clusterName},
 			{Name: "wan", Type: "wan"},

diff --git a/test-integ/catalogv2/implicit_destinations_test.go b/test-integ/catalogv2/implicit_destinations_test.go
@@ -108,7 +108,7 @@ func (c testBasicL4ImplicitDestinationsCreator) NewConfig(t *testing.T) *topolog
 	}
 
 	return &topology.Config{
-		Images: topoutil.TargetImages(),
+		Images: utils.TargetImages(),
 		Networks: []*topology.Network{
 			{Name: clusterName},
 			{Name: "wan", Type: "wan"},

diff --git a/test-integ/topoutil/images.go b/test-integ/topoutil/images.go
diff --git a/testing/deployer/topology/default_versions.go b/testing/deployer/topology/default_versions.go
diff --git a/testing/deployer/update-latest-versions.sh b/testing/deployer/update-latest-versions.sh
@@ -32,7 +32,9 @@ docker run -d --name consul-envoy-check "$consul_latest"
 envoy_version=""
 while true; do
     # We have to retry in case consul doesn't fully start up before we get here.
+    set +e
     envoy_version="$(docker exec consul-envoy-check sh -c 'wget -q localhost:8500/v1/agent/self -O -' | jq -r '.xDS.SupportedProxies.envoy[0]')"
+    set -e
     if [[ -n "$envoy_version" ]]; then
         break
     fi