luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Remove unnecessary default test config. (#15361)

This commit is contained in:
Derek Menteer 2022-11-14 14:07:42 -06:00 committed by GitHub
parent 8a2d3c6cc6
commit b3eaab3989
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/connect/envoy/consul-base-cfg/peering_server.hcl
View File

@ -1,6 +0,0 @@
ports {
grpc_tls = 8503
}
connect {
enabled = true
}

7
test/integration/connect/envoy/run-tests.sh
View File

@ -104,13 +104,6 @@ function init_workdir {
mv workdir/${CLUSTER}/consul/server.hcl workdir/${CLUSTER}/consul-server/server.hcl mv workdir/${CLUSTER}/consul/server.hcl workdir/${CLUSTER}/consul-server/server.hcl
fi 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 # copy the ca-certs for SDS so we can verify the right ones are served
mkdir -p workdir/test-sds-server/certs mkdir -p workdir/test-sds-server/certs
cp test-sds-server/certs/ca-root.crt workdir/test-sds-server/certs/ca-root.crt cp test-sds-server/certs/ca-root.crt workdir/test-sds-server/certs/ca-root.crt