diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index aecfaea395e..98977130962 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -383,9 +383,9 @@ case ${JOB_NAME} in kubernetes-e2e-gce-slow) : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-slow"} : ${E2E_NETWORK:="e2e-slow"} - : ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \ - ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ - )"} + : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Slow\] \ + --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"} + : ${GINKGO_PARALLEL:="y"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-slow"} : ${PROJECT:="k8s-jkns-e2e-gce-slow"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} @@ -603,6 +603,17 @@ case ${JOB_NAME} in )"} ;; + kubernetes-e2e-gke-slow) + : ${E2E_CLUSTER_NAME:="jkns-gke-e2e-slow"} + : ${E2E_NETWORK:="e2e-gke-slow"} + : ${E2E_SET_CLUSTER_API_VERSION:=y} + : ${PROJECT:="k8s-jkns-e2e-gke-slow"} + : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} + : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Slow\] \ + --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"} + : ${GINKGO_PARALLEL:="y"} + ;; + # Run the GCE_PARALLEL_SKIP_TESTS on GKE. kubernetes-e2e-gke-ci-reboot) : ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci-reboot"} diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml index 8e4074b73c4..354f8a3e64a 100644 --- a/hack/jenkins/job-configs/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml @@ -86,6 +86,9 @@ - cluster (k8s): ci/latest.txt
- tests: ci/latest.txt timeout: 300 + - 'gke-slow': + description: 'Run slow E2E tests on GKE using the latest successful build.' + timeout: 300 - 'gke-ci-reboot': description: | Run e2e tests using the following config: