Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reclassify [Example] and [Feature:Example] #19547

Merged
merged 1 commit into from
Jan 28, 2016
Merged

Reclassify [Example] and [Feature:Example] #19547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ CURRENT_RELEASE_PUBLISHED_VERSION="ci/latest-1.1"

# Specialized tests which should be skipped by default for projects.
GCE_DEFAULT_SKIP_TESTS=(
"\[Example\]" # previously in REBOOT_SKIP_TESTS..., dates back before version control (#10078)
"\[Skipped\]"
)

Expand Down Expand Up @@ -380,7 +379,7 @@ case ${JOB_NAME} in
kubernetes-e2e-gce-examples)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-examples"}
: ${E2E_NETWORK:="e2e-examples"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Example\]"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Example\]"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-examples"}
: ${PROJECT:="kubernetes-jenkins"}
;;
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/example_cluster_dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ try:
except:
print 'err'`

var _ = Describe("[Example] ClusterDns", func() {
var _ = Describe("ClusterDns [Feature:Example]", func() {
framework := NewFramework("cluster-dns")

var c *client.Client
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/example_k8petstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ T:
Ω(totalTransactions).Should(BeNumerically(">", minExpected))
}

var _ = Describe("[Example] Pet Store [Skipped]", func() {
var _ = Describe("Pet Store [Feature:Example]", func() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will now make these tests run ~everywhere. I don't think that's what we want?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feature tests are skipped by default:

https://github.com/kubernetes/kubernetes/blob/master/hack/jenkins/e2e.sh#L272

and

https://github.com/kubernetes/kubernetes/blob/master/test/e2e/e2e_test.go#L151

But it looks like I screwed up the [Feature] thing in e2e_test.go. Will send PR shortly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#19676 for typo fix.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, I was confused, because https://github.com/ihmccreery/kubernetes/blob/feature-example/hack/jenkins/e2e.sh doesn't show [Feature:], but I guess that's because it's a branch. OK.


// The number of nodes dictates total number of generators/transaction expectations.
var nodeCount int
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/examples.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const (
serverStartTimeout = podStartTimeout + 3*time.Minute
)

var _ = Describe("[Example] [Skipped]", func() {
var _ = Describe("[Feature:Example]", func() {
framework := NewFramework("examples")
var c *client.Client
var ns string
Expand Down