Skip to content

Commit

Permalink
backport of commit 87038bb
Browse files Browse the repository at this point in the history
  • Loading branch information
hashi-derek committed Nov 14, 2022
1 parent 6ca306f commit 40f081c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.

This file was deleted.

7 changes: 0 additions & 7 deletions test/integration/connect/envoy/run-tests.sh
Expand Up @@ -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
Expand Down

0 comments on commit 40f081c

Please sign in to comment.