From 61d3b250ee633a75536ea5202f763ea909341678 Mon Sep 17 00:00:00 2001 From: gmarek Date: Thu, 30 Jul 2015 12:29:06 +0200 Subject: [PATCH] Move initialization of Jenkins variables for soak tests to hack/jenkins/e2e.sh --- hack/jenkins/e2e.sh | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 8d3a0f0350d..d183a7538a7 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -124,6 +124,22 @@ GCE_PARALLEL_FLAKY_TESTS=( "Services.*release.*load\sbalancer" ) +# Tests that should not run on soak cluster. +GCE_SOAK_CONTINUOUS_SKIP_TESTS=( + "Density.*30\spods" + "Elasticsearch" + "Etcd.*SIGKILL" + "external\sload\sbalancer" + "identically\snamed\sservices" + "network\spartition" + "Reboot" + "Resize" + "Restart" + "Services.*Type\sgoes\sfrom" + "Services.*nodeport\ssettings" + "Skipped" + ) + # Define environment variables based on the Jenkins project name. case ${JOB_NAME} in # Runs all non-flaky tests on GCE, sequentially. @@ -201,7 +217,7 @@ case ${JOB_NAME} in : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-reboot"} : ${E2E_DOWN:="false"} : ${E2E_NETWORK:="e2e-reboot"} - : ${GINKGO_TEST_ARGS:=" --ginkgo.focus=Reboot"} + : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Reboot"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-reboot"} : ${PROJECT:="kubernetes-jenkins"} ;; @@ -220,6 +236,19 @@ case ${JOB_NAME} in NUM_MINIONS="100" ;; + # Runs tests on GCE soak cluster. + kubernetes-soak-continuous-e2e-gce) + : ${E2E_CLUSTER_NAME:="gce-soak-weekly"} + : ${E2E_DOWN:="false"} + : ${E2E_NETWORK:="gce-soak-weekly"} + : ${E2E_UP:="false"} + : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ + ${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]:+${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]}} \ + )"} + : ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly"} + : ${PROJECT:="kubernetes-jenkins"} + ;; + # Runs a subset of tests on GCE in parallel. Run against all pending PRs. kubernetes-pull-build-test-e2e-gce) : ${E2E_CLUSTER_NAME:="jenkins-pull-gce-e2e-${EXECUTOR_NUMBER}"}