github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19381 from ihmccreery/fix-reboot-suites

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-14 04:44:35 -08:00
commit ab93bbb135
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hack/jenkins/e2e.sh
View File

@ -498,11 +498,16 @@ case ${JOB_NAME} in
NUM_NODES=${NUM_NODES_PARALLEL} NUM_NODES=${NUM_NODES_PARALLEL}
;; ;;
# Runs only the reboot tests on GCE. # Run the GCE_PARALLEL_SKIP_TESTS on GCE.
kubernetes-e2e-gce-reboot) kubernetes-e2e-gce-reboot)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-reboot"} : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-reboot"}
: ${E2E_NETWORK:="e2e-reboot"} : ${E2E_NETWORK:="e2e-reboot"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Reboot"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_allow_empty \
${GCE_PARALLEL_SKIP_TESTS[@]:+${GCE_PARALLEL_SKIP_TESTS[@]}} \
) --ginkgo.skip=$(join_regex_no_empty \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
)"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-reboot"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-reboot"}
: ${PROJECT:="kubernetes-jenkins"} : ${PROJECT:="kubernetes-jenkins"}
;; ;;
@ -617,17 +622,19 @@ case ${JOB_NAME} in
)"} )"}
;; ;;
# Run the GCE_PARALLEL_SKIP_TESTS on GKE.
kubernetes-e2e-gke-ci-reboot) kubernetes-e2e-gke-ci-reboot)
: ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci-reboot"} : ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci-reboot"}
: ${E2E_NETWORK:="e2e-gke-ci-reboot"} : ${E2E_NETWORK:="e2e-gke-ci-reboot"}
: ${E2E_SET_CLUSTER_API_VERSION:=y} : ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${PROJECT:="k8s-jkns-e2e-gke-ci-reboot"} : ${PROJECT:="k8s-jkns-e2e-gke-ci-reboot"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ : ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_allow_empty \
"\[Skipped\]" \ ${GCE_PARALLEL_SKIP_TESTS[@]:+${GCE_PARALLEL_SKIP_TESTS[@]}} \
${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \ ) --ginkgo.skip=$(join_regex_no_empty \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ ${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \
)"} )"}
;; ;;