Skip to content

Commit 302be5a

Browse files
Dump diagnostic information from snippets runs
1 parent 39c7d8f commit 302be5a

File tree

6 files changed

+27
-8
lines changed

6 files changed

+27
-8
lines changed

.evergreen-snippets.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ variables:
77
- func: setup_mongosh
88
- func: download_kube_tools
99
- func: build_multi_cluster_binary
10-
teardown_group:
10+
teardown_task:
11+
- func: upload_e2e_logs
1112
- func: upload_code_snippets_logs
1213

1314
- &setup_and_teardown_group_kind_code_snippets
@@ -18,12 +19,9 @@ variables:
1819
- func: download_kube_tools
1920
- func: configure_docker_auth
2021
- func: setup_kubernetes_environment
21-
- func: setup_cloud_qa
2222
teardown_task:
2323
- func: upload_e2e_logs
2424
- func: upload_code_snippets_logs
25-
- func: teardown_kubernetes_environment
26-
- func: teardown_cloud_qa
2725

2826
# This variable is copied over from .evergreen.yml because anchors don't work for included files
2927
- &base_om8_dependency
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
mkdir -p secrets
22

3-
gcloud iam service-accounts keys create secrets/external-dns-sa-key.json --iam-account="${DNS_SA_EMAIL}"
3+
gcloud iam service-accounts keys create secrets/external-dns-sa-key.json --iam-account="${DNS_SA_EMAIL}" || true

scripts/code_snippets/tests/test_gke_multi_cluster_no_mesh_snippets.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@ function cleanup() {
3030
echo "Not deleting anything"
3131
fi
3232
}
33-
trap cleanup EXIT
33+
34+
function on_exit() {
35+
scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh
36+
cleanup
37+
}
38+
39+
trap on_exit EXIT
3440

3541
# store all outputs in
3642

scripts/code_snippets/tests/test_gke_multi_cluster_snippets.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,14 @@ function cleanup() {
2525
echo "Not deleting anything"
2626
fi
2727
}
28-
trap cleanup EXIT
28+
29+
function on_exit() {
30+
scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh
31+
cleanup
32+
}
33+
34+
trap on_exit EXIT
35+
2936

3037
source public/architectures/setup-multi-cluster/ra-01-setup-gke/env_variables.sh
3138
./public/architectures/setup-multi-cluster/ra-01-setup-gke/test.sh

scripts/code_snippets/tests/test_kind_search_community_snippets.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ dump_logs() {
1818
echo
1919
fi
2020
}
21-
trap dump_logs EXIT
21+
22+
function on_exit() {
23+
scripts/evergreen/e2e/dump_diagnostic_information_from_all_namespaces.sh
24+
}
25+
trap on_exit EXIT
2226

2327
test_dir="./docs/search/01-search-community-deploy"
2428
source "${test_dir}/env_variables.sh"

scripts/evergreen/e2e/dump_diagnostic_information.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ dump_all_non_default_namespaces() {
2828
grep -v "kube-public" | \
2929
grep -v "kube-system" | \
3030
grep -v "local-path-storage" | \
31+
grep -v "gmp-" | \
32+
grep -v "gke-managed" | \
33+
grep -v "local-path-storage" | \
34+
grep -v "local-path-storage" | \
3135
grep -v "metallb-system"
3236
)
3337

0 commit comments

Comments
 (0)