github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix serial jobs by using right project and using selectors properly

pull/6/head
Isaac Hollander McCreery 2016-01-19 11:08:03 -08:00
parent 810544633e
commit 5daf01bfd1
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hack/jenkins/e2e.sh
View File

@ -512,13 +512,8 @@ case ${JOB_NAME} in
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-serial"} : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-serial"}
: ${E2E_NETWORK:="jenkins-gce-e2e-serial"} : ${E2E_NETWORK:="jenkins-gce-e2e-serial"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \ : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Serial\]|\[Disruptive\]|\[Feature:Restart\] \
\[Serial\] \ --ginkgo.skip=\[Flaky\]"}
\[Disruptive\] \
\[Feature:Restart\] \
) --ginkgo.skip=$(join_regex_no_empty \
\[Flaky\]
)"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-serial"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-serial"}
: ${PROJECT:="kubernetes-jkns-e2e-gce-serial"} : ${PROJECT:="kubernetes-jkns-e2e-gce-serial"}
;; ;;
@ -529,14 +524,9 @@ case ${JOB_NAME} in
: ${E2E_NETWORK:="jenkins-gke-e2e-serial"} : ${E2E_NETWORK:="jenkins-gke-e2e-serial"}
: ${E2E_SET_CLUSTER_API_VERSION:=y} : ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \ : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Serial\]|\[Disruptive\]|\[Feature:Restart\] \
\[Serial\] \ --ginkgo.skip=\[Flaky\]"}
\[Disruptive\] \ : ${PROJECT:="jenkins-gke-e2e-serial"}
\[Feature:Restart\] \
) --ginkgo.skip=$(join_regex_no_empty \
\[Flaky\]
)"}
: ${PROJECT:="kubernetes-jkns-e2e-gke-serial"}
;; ;;
# Runs the performance/scalability tests on GCE. A larger cluster is used. # Runs the performance/scalability tests on GCE. A larger cluster is used.