Skip to content

K
k3s
Commit 9748d267 authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Merge pull request #11290 from wojtek-t/fix_jenkins_tests

Fix Jenkins - currently all tests are running under "gce-flaky" suite instead of "gce" suite
parents d1e92e04 635e8289
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
hack/jenkins/e2e.sh
View file @ 9748d267
...@@ -74,7 +74,11 @@ Example\ ...@@ -74,7 +74,11 @@ Example\
" "
# The following tests are known to be flaky, and are thus run only in their own # The following tests are known to be flaky, and are thus run only in their own
# -flaky- build variants. # -flaky- build variants.
GCE_FLAKY_TEST_REGEX="" # NOTE: if you want the flaky test suite to be empty, you CANNOT leave the
# regexp empty - this will cause running all tests in flaky suite and no tests
# in regular "gce" suite.
GCE_FLAKY_TEST_REGEX="DO\sNOT\sRUN\sANYTHING"
# Tests which are not able to be run in parallel. # Tests which are not able to be run in parallel.
GCE_PARALLEL_SKIP_TEST_REGEX="\ GCE_PARALLEL_SKIP_TEST_REGEX="\
${GCE_DEFAULT_SKIP_TEST_REGEX}\ ${GCE_DEFAULT_SKIP_TEST_REGEX}\
...@@ -86,7 +90,6 @@ ${GCE_DEFAULT_SKIP_TEST_REGEX}\ ...@@ -86,7 +90,6 @@ ${GCE_DEFAULT_SKIP_TEST_REGEX}\
|Shell.*services\ |Shell.*services\
" "
# Tests which are known to be flaky when run in parallel. # Tests which are known to be flaky when run in parallel.
# TODO: figure out why GCE_FLAKY_TEST_REGEX is not a perfect subset of this list.
GCE_PARALLEL_FLAKY_TEST_REGEX="\ GCE_PARALLEL_FLAKY_TEST_REGEX="\
Elasticsearch\ Elasticsearch\
|PD\ |PD\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment