Change where the envoy snapshots get put when a test fails (#7298)

This will allow us to capture them in CI
This commit is contained in:
Matt Keeler 2020-03-05 16:01:10 -05:00 committed by GitHub
parent ebb0ecf5a8
commit 0041102e29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions

View File

@ -74,6 +74,6 @@ load helpers
assert_expected_fortio_name s2-secondary assert_expected_fortio_name s2-secondary
} }
@test "s1 upstream made 1 connection" { @test "s1 upstream made 1 connection again" {
assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.s2.default.primary.*cx_total" 1 assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.s2.default.primary.*cx_total" 1
} }

View File

@ -179,11 +179,12 @@ function snapshot_envoy_admin {
local HOSTPORT=$1 local HOSTPORT=$1
local ENVOY_NAME=$2 local ENVOY_NAME=$2
local DC=${3:-primary} local DC=${3:-primary}
local OUTDIR="${LOG_DIR}/envoy-snapshots/${DC}/${ENVOY_NAME}"
docker_wget "$DC" "http://${HOSTPORT}/config_dump" -q -O - > "./workdir/${DC}/envoy/${ENVOY_NAME}-config_dump.json" mkdir -p "${OUTDIR}"
docker_wget "$DC" "http://${HOSTPORT}/clusters?format=json" -q -O - > "./workdir/${DC}/envoy/${ENVOY_NAME}-clusters.json" docker_wget "$DC" "http://${HOSTPORT}/config_dump" -q -O - > "${OUTDIR}/config_dump.json"
docker_wget "$DC" "http://${HOSTPORT}/stats" -q -O - > "./workdir/${DC}/envoy/${ENVOY_NAME}-stats.txt" docker_wget "$DC" "http://${HOSTPORT}/clusters?format=json" -q -O - > "${OUTDIR}/clusters.json"
docker_wget "$DC" "http://${HOSTPORT}/stats" -q -O - > "${OUTDIR}/stats.txt"
} }
function reset_envoy_metrics { function reset_envoy_metrics {