Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sonobouy tests on v1.25

Browse Source 
Use --disable instead of --no-deploy, and don't silently succeed if sonobouy never runs

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson 2022-11-01 22:43:31 +00:00 committed by Brad Davidson
parent d5ffc4b1d1
commit 86d3686e6c
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/test-setup-sonobuoy
View File

@ -2,7 +2,7 @@
export NUM_SERVERS=1
export NUM_AGENTS=1
export SERVER_ARGS='--no-deploy=traefik'
export SERVER_ARGS='--disable=traefik'
export WAIT_SERVICES='coredns local-path-provisioner metrics-server'
export sonobuoyParallelArgs=(--e2e-focus='\[Conformance\]' --e2e-skip='\[Serial\]' --e2e-parallel=y)
@ -14,13 +14,13 @@ start-test() {
export -f start-test
test-post-hook() {
if [[ $1 -eq 0 ]]; then
return
if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
return $1
fi
local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR"/sonobuoy/plugins/e2e/results/global/e2e.log)
local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
# Ignore sonobuoy failures if only these flaky tests have failed
flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )
[ "$totalFails" -le "$flakyFails" ]
}
export -f test-post-hook
export -f test-post-hook

6
scripts/test-setup-sonobuoy-etcd
View File

@ -15,10 +15,10 @@ server-post-hook() {
export -f server-post-hook
test-post-hook() {
if [[ $1 -eq 0 ]]; then
return
if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
return $1
fi
local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR"/sonobuoy/plugins/e2e/results/global/e2e.log)
local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
# Ignore sonobuoy failures if only these flaky tests have failed
flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )

6
scripts/test-setup-sonobuoy-mysql
View File

@ -42,10 +42,10 @@ cluster-pre-hook() {
export -f cluster-pre-hook
test-post-hook() {
if [[ $1 -eq 0 ]]; then
return
if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
return $1
fi
local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR"/sonobuoy/plugins/e2e/results/global/e2e.log)
local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
# Ignore sonobuoy failures if only these flaky tests have failed
flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )

6
scripts/test-setup-sonobuoy-postgres
View File

@ -42,10 +42,10 @@ cluster-pre-hook() {
export -f cluster-pre-hook
test-post-hook() {
if [[ $1 -eq 0 ]]; then
return
if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
return $1
fi
local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR"/sonobuoy/plugins/e2e/results/global/e2e.log)
local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
# Ignore sonobuoy failures if only these flaky tests have failed
flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )