github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20297 from ihmccreery/skip-feature-serial

Browse Source 
Reclassify Restart tests as [Disruptive] and skip [Feature:.+] tests in -serial jobs
This commit is contained in:
Fabio Yeon 2016-01-28 16:47:05 -08:00
commit c3e966a4ea
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hack/jenkins/e2e.sh
View File

@ -475,8 +475,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=\[Serial\]|\[Disruptive\]|\[Feature:Restart\] \ : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Serial\]|\[Disruptive\] \
--ginkgo.skip=\[Flaky\]"} --ginkgo.skip=\[Flaky\]|\[Feature:.+\]"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-serial"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-serial"}
: ${PROJECT:="kubernetes-jkns-e2e-gce-serial"} : ${PROJECT:="kubernetes-jkns-e2e-gce-serial"}
;; ;;
@ -487,8 +487,8 @@ 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=\[Serial\]|\[Disruptive\]|\[Feature:Restart\] \ : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Serial\]|\[Disruptive\] \
--ginkgo.skip=\[Flaky\]"} --ginkgo.skip=\[Flaky\]|\[Feature:.+\]"}
: ${PROJECT:="jenkins-gke-e2e-serial"} : ${PROJECT:="jenkins-gke-e2e-serial"}
;; ;;

4
test/e2e/restart.go
View File

@ -48,9 +48,7 @@ const (
restartPodReadyAgainTimeout = 5 * time.Minute restartPodReadyAgainTimeout = 5 * time.Minute
) )
// TODO(ihmccreery): These tests haven't been run for a while, so until they're var _ = Describe("Restart [Disruptive]", func() {
// known stable, consider them a non-core feature.
var _ = Describe("Restart [Feature:Restart]", func() {
var c *client.Client var c *client.Client
var ps *podStore var ps *podStore
var skipped bool var skipped bool