diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index a2e6fd173ab..3947b3b7481 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -304,16 +304,13 @@ GCE_PARALLEL_SKIP_TESTS=( # release branches defines relevant jobs for that particular version of # Kubernetes. case ${JOB_NAME} in - # Runs all non-flaky, non-slow tests on GCE, sequentially. + # Runs all non-slow, non-serial, non-flaky, tests on GCE in parallel. kubernetes-e2e-gce) : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e"} : ${E2E_PUBLISH_GREEN_VERSION:="true"} : ${E2E_NETWORK:="e2e-gce"} - : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ - ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ - ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ - ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ - )"} + : ${GINKGO_TEST_ARGS:="--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"} + : ${GINKGO_PARALLEL:="y"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce"} : ${PROJECT:="k8s-jkns-e2e-gce"} : ${ENABLE_DEPLOYMENTS:=true} @@ -591,17 +588,15 @@ case ${JOB_NAME} in : ${PROJECT:="kubernetes-jenkins"} ;; - kubernetes-e2e-gke-ci) + # Runs all non-slow, non-serial, non-flaky, tests on GKE in parallel. + kubernetes-e2e-gke) : ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci"} : ${E2E_NETWORK:="e2e-gke-ci"} : ${E2E_SET_CLUSTER_API_VERSION:=y} : ${PROJECT:="k8s-jkns-e2e-gke-ci"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} - : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ - ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ - ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ - ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ - )"} + : ${GINKGO_TEST_ARGS:="--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]"} + : ${GINKGO_PARALLEL:="y"} ;; # Run the GCE_PARALLEL_SKIP_TESTS on GKE. diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml index d86935da498..7f2d38f5483 100644 --- a/hack/jenkins/job-configs/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml @@ -73,15 +73,8 @@ branch: 'master' emails: '$DEFAULT_RECIPIENTS, cloud-kubernetes-alerts@google.com' suffix: - - 'gke-ci': - description: | - Run e2e tests using the following config:
- - provider: GKE
- - apiary: staging
- - borg job: test
- - client (kubectl): ci/latest.txt
- - cluster (k8s): ci/latest.txt
- - tests: ci/latest.txt + - 'gke': + description: Runs all non-slow, non-serial, non-flaky, tests on GKE in parallel (against GKE test endpoint) timeout: 300 - 'gke-ci-reboot': description: |