Merge pull request #19547 from ihmccreery/feature-example

Reclassify [Example] and [Feature:Example]
This commit is contained in:
Fabio Yeon 2016-01-28 14:03:48 -08:00
commit 454ebc4e30
4 changed files with 4 additions and 5 deletions

View File

@ -265,7 +265,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\]"
"\[Feature:.+\]"
)
@ -346,7 +345,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"}
;;

View File

@ -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

View File

@ -150,7 +150,7 @@ T:
Ω(totalTransactions).Should(BeNumerically(">", minExpected))
}
var _ = Describe("[Example] Pet Store [Skipped]", func() {
var _ = Describe("Pet Store [Feature:Example]", func() {
// The number of nodes dictates total number of generators/transaction expectations.
var nodeCount int

View File

@ -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