From 0c93f75629ffb86cb7b2f2729b5124bfdff64c67 Mon Sep 17 00:00:00 2001 From: Jun Xiang Tee Date: Wed, 12 Jul 2017 11:35:57 -0700 Subject: [PATCH] add [sig-apps] prefix to workload e2e tests --- test/e2e/network_partition.go | 2 +- test/e2e/workload/BUILD | 1 + test/e2e/workload/cronjob.go | 2 +- test/e2e/workload/daemon_restart.go | 2 +- test/e2e/workload/daemon_set.go | 2 +- test/e2e/workload/deployment.go | 2 +- test/e2e/workload/disruption.go | 2 +- test/e2e/workload/framework.go | 23 +++++++++++++++++++++++ test/e2e/workload/job.go | 2 +- test/e2e/workload/rc.go | 2 +- test/e2e/workload/replica_set.go | 2 +- test/e2e/workload/statefulset.go | 2 +- 12 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 test/e2e/workload/framework.go diff --git a/test/e2e/network_partition.go b/test/e2e/network_partition.go index fb058f4a12d..d29430db944 100644 --- a/test/e2e/network_partition.go +++ b/test/e2e/network_partition.go @@ -98,7 +98,7 @@ func newPodOnNode(c clientset.Interface, namespace, podName, nodeName string) er return err } -var _ = framework.KubeDescribe("Network Partition [Disruptive] [Slow]", func() { +var _ = framework.KubeDescribe("[sig-apps] Network Partition [Disruptive] [Slow]", func() { f := framework.NewDefaultFramework("network-partition") var systemPodsNo int32 var c clientset.Interface diff --git a/test/e2e/workload/BUILD b/test/e2e/workload/BUILD index 021b62830e2..c9b74ddb818 100644 --- a/test/e2e/workload/BUILD +++ b/test/e2e/workload/BUILD @@ -15,6 +15,7 @@ go_library( "daemon_set.go", "deployment.go", "disruption.go", + "framework.go", "job.go", "rc.go", "replica_set.go", diff --git a/test/e2e/workload/cronjob.go b/test/e2e/workload/cronjob.go index b3a5991bbcd..ed4ee1a13f2 100644 --- a/test/e2e/workload/cronjob.go +++ b/test/e2e/workload/cronjob.go @@ -42,7 +42,7 @@ const ( cronJobTimeout = 5 * time.Minute ) -var _ = framework.KubeDescribe("CronJob", func() { +var _ = SIGDescribe("CronJob", func() { f := framework.NewDefaultFramework("cronjob") sleepCommand := []string{"sleep", "300"} diff --git a/test/e2e/workload/daemon_restart.go b/test/e2e/workload/daemon_restart.go index 90ef0f82e50..29117a26316 100644 --- a/test/e2e/workload/daemon_restart.go +++ b/test/e2e/workload/daemon_restart.go @@ -177,7 +177,7 @@ func getContainerRestarts(c clientset.Interface, ns string, labelSelector labels return failedContainers, containerRestartNodes.List() } -var _ = framework.KubeDescribe("DaemonRestart [Disruptive]", func() { +var _ = SIGDescribe("DaemonRestart [Disruptive]", func() { f := framework.NewDefaultFramework("daemonrestart") rcName := "daemonrestart" + strconv.Itoa(numPods) + "-" + string(uuid.NewUUID()) diff --git a/test/e2e/workload/daemon_set.go b/test/e2e/workload/daemon_set.go index 1caca62791d..598414c8582 100644 --- a/test/e2e/workload/daemon_set.go +++ b/test/e2e/workload/daemon_set.go @@ -62,7 +62,7 @@ const ( // happen. In the future, running in parallel may work if we have an eviction // model which lets the DS controller kick out other pods to make room. // See http://issues.k8s.io/21767 for more details -var _ = framework.KubeDescribe("Daemon set [Serial]", func() { +var _ = SIGDescribe("Daemon set [Serial]", func() { var f *framework.Framework AfterEach(func() { diff --git a/test/e2e/workload/deployment.go b/test/e2e/workload/deployment.go index e913ee75e74..919e93dd110 100644 --- a/test/e2e/workload/deployment.go +++ b/test/e2e/workload/deployment.go @@ -55,7 +55,7 @@ var ( nilRs *extensions.ReplicaSet ) -var _ = framework.KubeDescribe("Deployment", func() { +var _ = SIGDescribe("Deployment", func() { var ns string var c clientset.Interface diff --git a/test/e2e/workload/disruption.go b/test/e2e/workload/disruption.go index 21047d131a5..2882b5bd35c 100644 --- a/test/e2e/workload/disruption.go +++ b/test/e2e/workload/disruption.go @@ -41,7 +41,7 @@ const ( timeout = 60 * time.Second ) -var _ = framework.KubeDescribe("DisruptionController", func() { +var _ = SIGDescribe("DisruptionController", func() { f := framework.NewDefaultFramework("disruption") var ns string var cs *kubernetes.Clientset diff --git a/test/e2e/workload/framework.go b/test/e2e/workload/framework.go new file mode 100644 index 00000000000..e7615c5ccb6 --- /dev/null +++ b/test/e2e/workload/framework.go @@ -0,0 +1,23 @@ +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package workload + +import "github.com/onsi/ginkgo" + +func SIGDescribe(text string, body func()) bool { + return ginkgo.Describe("[sig-apps] "+text, body) +} diff --git a/test/e2e/workload/job.go b/test/e2e/workload/job.go index 0c9470ff74a..95a78564a5d 100644 --- a/test/e2e/workload/job.go +++ b/test/e2e/workload/job.go @@ -32,7 +32,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = framework.KubeDescribe("Job", func() { +var _ = SIGDescribe("Job", func() { f := framework.NewDefaultFramework("job") parallelism := int32(2) completions := int32(4) diff --git a/test/e2e/workload/rc.go b/test/e2e/workload/rc.go index fde77d682b6..776480e1398 100644 --- a/test/e2e/workload/rc.go +++ b/test/e2e/workload/rc.go @@ -34,7 +34,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = framework.KubeDescribe("ReplicationController", func() { +var _ = SIGDescribe("ReplicationController", func() { f := framework.NewDefaultFramework("replication-controller") It("should serve a basic image on each replica with a public image [Conformance]", func() { diff --git a/test/e2e/workload/replica_set.go b/test/e2e/workload/replica_set.go index 73c6191e258..48362c3b882 100644 --- a/test/e2e/workload/replica_set.go +++ b/test/e2e/workload/replica_set.go @@ -74,7 +74,7 @@ func newPodQuota(name, number string) *v1.ResourceQuota { } } -var _ = framework.KubeDescribe("ReplicaSet", func() { +var _ = SIGDescribe("ReplicaSet", func() { f := framework.NewDefaultFramework("replicaset") It("should serve a basic image on each replica with a public image [Conformance]", func() { diff --git a/test/e2e/workload/statefulset.go b/test/e2e/workload/statefulset.go index 31a3d2c4f02..f5f39889728 100644 --- a/test/e2e/workload/statefulset.go +++ b/test/e2e/workload/statefulset.go @@ -50,7 +50,7 @@ const ( // GCE Quota requirements: 3 pds, one per stateful pod manifest declared above. // GCE Api requirements: nodes and master need storage r/w permissions. -var _ = framework.KubeDescribe("StatefulSet", func() { +var _ = SIGDescribe("StatefulSet", func() { f := framework.NewDefaultFramework("statefulset") var ns string var c clientset.Interface