Merge 87038bb into backport/derekm/remove-test-defaults/terminally-in…

…timate-dory
hashicorp · Nov 14, 2022 · 2a6ff8d · 2a6ff8d
2 parents da0f328 + 87038bb
commit 2a6ff8d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/test/integration/connect/envoy/consul-base-cfg/peering_server.hcl b/test/integration/connect/envoy/consul-base-cfg/peering_server.hcl
diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
@@ -104,13 +104,6 @@ function init_workdir {
     mv workdir/${CLUSTER}/consul/server.hcl workdir/${CLUSTER}/consul-server/server.hcl
   fi
 
-  if test -f "workdir/${CLUSTER}/consul/peering_server.hcl" -a $REQUIRE_PEERS = "1"
-  then
-    mv workdir/${CLUSTER}/consul/peering_server.hcl workdir/${CLUSTER}/consul-server/peering_server.hcl
-  else
-    rm workdir/${CLUSTER}/consul/peering_server.hcl
-  fi
-
   # copy the ca-certs for SDS so we can verify the right ones are served
   mkdir -p workdir/test-sds-server/certs
   cp test-sds-server/certs/ca-root.crt workdir/test-sds-server/certs/ca-root.crt