Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not override global RUN_E2E_SKIP in e2e script #3173

Merged
merged 1 commit into from
Jan 6, 2022
Merged

Do not override global RUN_E2E_SKIP in e2e script #3173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ci/run-k8s-e2e-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,29 +188,33 @@ function run_sonobuoy() {
}

function run_conformance() {
local e2e_skip="${DEFAULT_E2E_CONFORMANCE_SKIP}"

if [[ "$RUN_E2E_FOCUS" != "" ]]; then
echo "It is not allowed to specify focus when running conformance tests"
exit 1
fi
if [[ "$RUN_E2E_SKIP" == "" ]]; then
RUN_E2E_SKIP="${DEFAULT_E2E_CONFORMANCE_SKIP}"
if [[ "$RUN_E2E_SKIP" != "" ]]; then
e2e_skip="$RUN_E2E_SKIP"
fi
run_sonobuoy "${DEFAULT_E2E_CONFORMANCE_FOCUS}" "${RUN_E2E_SKIP}"
run_sonobuoy "${DEFAULT_E2E_CONFORMANCE_FOCUS}" "${e2e_skip}"
}

function run_whole_conformance() {
run_sonobuoy "" ""
}

function run_network_policy() {
local e2e_skip="${DEFAULT_E2E_NETWORKPOLICY_SKIP}"

if [[ "$RUN_E2E_FOCUS" != "" ]]; then
echo "It is not allowed to specify focus when running network policy tests"
exit 1
fi
if [[ "$RUN_E2E_SKIP" == "" ]]; then
RUN_E2E_SKIP="${DEFAULT_E2E_NETWORKPOLICY_SKIP}"
if [[ "$RUN_E2E_SKIP" != "" ]]; then
e2e_skip="$RUN_E2E_SKIP"
fi
run_sonobuoy "${DEFAULT_E2E_NETWORKPOLICY_FOCUS}" "${RUN_E2E_SKIP}"
run_sonobuoy "${DEFAULT_E2E_NETWORKPOLICY_FOCUS}" "${e2e_skip}"
}

if [[ "$RUN_E2E_FOCUS" != "" ]]; then
Expand Down