diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 1c375d3080..704f15345e 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -265,13 +265,19 @@ fi # When 1.2.0-beta.0 comes out, e.g., this will become "ci/latest-1.2" CURRENT_RELEASE_PUBLISHED_VERSION="ci/latest-1.1" -# Specialized tests which should be skipped by default for projects. -GCE_DEFAULT_SKIP_TESTS=( - "\[Example\]" # previously in REBOOT_SKIP_TESTS..., dates back before version control (#10078) - "\[Skipped\]" +# Specialized to skip when running reboot tests. +REBOOT_SKIP_TESTS=( + "Restart\sshould\srestart\sall\snodes" + "\[Example\]" ) -# PROVIDER SKIPS -------------------------------------- +# Specialized tests which should be skipped by default for projects. +GCE_DEFAULT_SKIP_TESTS=( + "${REBOOT_SKIP_TESTS[@]}" + "\[Skipped\]" + "Reboot" + "ServiceLoadBalancer" + ) # Tests which cannot be run on GKE, e.g. because they require # master ssh access. @@ -301,7 +307,6 @@ AWS_REQUIRED_SKIP_TESTS=( "GCE\sL7\sLoadBalancer\sController" # GCE L7 loadbalancing ) -# END PROVIDER SKIPS -------------------------------------- # Tests which kills or restarts components and/or nodes. DISRUPTIVE_TESTS=( @@ -321,6 +326,10 @@ GCE_FLAKY_TESTS=( # comments below, and for poorly implemented tests, please quote the # issue number tracking speed improvements. GCE_SLOW_TESTS=( + # Before enabling this loadbalancer test in any other test list you must + # make sure the associated project has enough quota. At the time of this + # writing a GCE project is allowed 3 backend services by default. This + # test requires at least 5. "\[Slow\]" ) @@ -332,6 +341,21 @@ GCE_PARALLEL_SKIP_TESTS=( "\[Disruptive\]" ) +# Tests that should not run on soak cluster. +GCE_SOAK_CONTINUOUS_SKIP_TESTS=( + "GCE\sL7\sLoadBalancer\sController" # issue: #17119 + "Density.*30\spods" + "Elasticsearch" + "external\sload\sbalancer" + "identically\snamed\sservices" + "network\spartition" + "Services.*Type\sgoes\sfrom" + "${DISRUPTIVE_TESTS[@]}" # avoid component restarts. + ) + +GCE_RELEASE_SKIP_TESTS=( + ) + # Define environment variables based on the Jenkins project name. # NOTE: Not all jobs are defined here. The hack/jenkins/e2e.sh in master and # release branches defines relevant jobs for that particular version of @@ -592,13 +616,10 @@ case ${JOB_NAME} in : ${E2E_UP:="false"} # Clear out any orphaned namespaces in case previous run was interrupted. : ${E2E_CLEAN_START:="true"} - # We should be testing the reliability of a long-running cluster. The - # DISRUPTIVE_TESTS kill/restart components or nodes in the cluster, - # defeating the purpose of a soak cluster. (#15722) : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ - ${DISRUPTIVE_TESTS[@]:+${DISRUPTIVE_TESTS[@]}} \ + ${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]:+${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]}} \ )"} : ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly"} : ${PROJECT:="kubernetes-jenkins"} @@ -626,6 +647,7 @@ case ${JOB_NAME} in : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ "\[Skipped\]" \ ${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \ + ${REBOOT_SKIP_TESTS[@]:+${REBOOT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ )"} @@ -668,14 +690,11 @@ case ${JOB_NAME} in : ${E2E_CLEAN_START:="true"} : ${PROJECT:="kubernetes-jenkins"} : ${E2E_OPT:="--check_version_skew=false"} - # We should be testing the reliability of a long-running cluster. The - # DISRUPTIVE_TESTS kill/restart components or nodes in the cluster, - # defeating the purpose of a soak cluster. (#15722) : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}} \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ - ${DISRUPTIVE_TESTS[@]:+${DISRUPTIVE_TESTS[@]}} \ + ${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]:+${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]}} \ )"} ;; diff --git a/test/e2e/ingress.go b/test/e2e/ingress.go index 772d3c8e12..832c7d2b31 100644 --- a/test/e2e/ingress.go +++ b/test/e2e/ingress.go @@ -390,11 +390,6 @@ func (cont *IngressController) Cleanup(del bool) error { return fmt.Errorf(errMsg) } -// Before enabling this loadbalancer test in any other test list you must -// make sure the associated project has enough quota. At the time of this -// writing a GCE project is allowed 3 backend services by default. This -// test requires at least 5. -// // Slow by design (10 min) // Flaky issue #17518 var _ = Describe("GCE L7 LoadBalancer Controller [Serial] [Slow] [Flaky]", func() { diff --git a/test/e2e/restart.go b/test/e2e/restart.go index 32cee9e14c..62570186ca 100644 --- a/test/e2e/restart.go +++ b/test/e2e/restart.go @@ -48,9 +48,7 @@ const ( restartPodReadyAgainTimeout = 5 * time.Minute ) -// TODO(ihmccreery): This is skipped because it was previously in -// REBOOT_SKIP_TESTS, dates back before version control (#10078) -var _ = Describe("Restart [Skipped]", func() { +var _ = Describe("Restart", func() { var c *client.Client var ps *podStore var skipped bool diff --git a/test/e2e/serviceloadbalancers.go b/test/e2e/serviceloadbalancers.go index 82748cb695..5a5938c44b 100644 --- a/test/e2e/serviceloadbalancers.go +++ b/test/e2e/serviceloadbalancers.go @@ -203,9 +203,7 @@ func (s *ingManager) test(path string) error { }) } -// TODO(ihmccreery) Skipped originally in #14988, never sent follow-up PR, as -// far as I can tell. -var _ = Describe("ServiceLoadBalancer [Skipped]", func() { +var _ = Describe("ServiceLoadBalancer", func() { // These variables are initialized after framework's beforeEach. var ns string var repoRoot string