diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 60685a1d3fd..d10b5155cd8 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -410,24 +410,6 @@ case ${JOB_NAME} in NUM_NODES=${NUM_NODES_PARALLEL} ;; - # Runs all non-flaky tests on GCE in parallel. - kubernetes-e2e-gce-parallel) - : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-parallel"} - : ${E2E_NETWORK:="e2e-parallel"} - : ${GINKGO_PARALLEL:="y"} - : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ - ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ - ${GCE_PARALLEL_SKIP_TESTS[@]:+${GCE_PARALLEL_SKIP_TESTS[@]}} \ - ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ - ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ - )"} - : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-test-parallel"} - : ${PROJECT:="kubernetes-jenkins"} - : ${ENABLE_DEPLOYMENTS:=true} - # Override GCE defaults - NUM_NODES=${NUM_NODES_PARALLEL} - ;; - # Runs all non-flaky tests on AWS in parallel. kubernetes-e2e-aws-parallel) : ${E2E_CLUSTER_NAME:="jenkins-aws-e2e-parallel"} diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml index 97e785e7b8b..1d5cd706108 100644 --- a/hack/jenkins/job-configs/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml @@ -45,9 +45,6 @@ - 'gce-flaky': description: 'Run E2E tests on GCE using the latest successful build. Limit to known-flaky tests.' timeout: 180 - - 'gce-parallel': - description: 'Run E2E tests using Ginkgo''s parallel test runner on GCE using the latest successful build.' - timeout: 120 - 'gce-parallel-flaky': description: 'Run E2E tests using Ginkgo''s parallel test runner on GCE using the latest successful build. Limit to known-flaky tests.' timeout: 90