From 3a8e84c2daf7f63d78b847b5e2b5cf7c7a6ebaa2 Mon Sep 17 00:00:00 2001
From: wojtekt <wojtekt@google.com>
Date: Fri, 26 Feb 2021 16:54:13 +0100
Subject: [PATCH] Move ownership of core events test to sig-instrumentation

---
 test/conformance/testdata/conformance.yaml    | 30 +++++++++----------
 .../core_events.go}                           |  5 ++--
 2 files changed, 18 insertions(+), 17 deletions(-)
 rename test/e2e/{apimachinery/events.go => instrumentation/core_events.go} (98%)

diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml
index f88ad75570d..fff626174b6 100755
--- a/test/conformance/testdata/conformance.yaml
+++ b/test/conformance/testdata/conformance.yaml
@@ -317,21 +317,6 @@
     return a valid PreferredVersion unless the group suffix is example.com.
   release: v1.19
   file: test/e2e/apimachinery/discovery.go
-- testname: Event, delete a collection
-  codename: '[sig-api-machinery] Events should delete a collection of events [Conformance]'
-  description: A set of events is created with a label selector which MUST be found
-    when listed. The set of events is deleted and MUST NOT show up when listed by
-    its label selector.
-  release: v1.20
-  file: test/e2e/apimachinery/events.go
-- testname: Event resource lifecycle
-  codename: '[sig-api-machinery] Events should ensure that an event can be fetched,
-    patched, deleted, and listed [Conformance]'
-  description: Create an event, the event MUST exist. The event is patched with a
-    new message, the check MUST have the update message. The event is deleted and
-    MUST NOT show up when listing all events.
-  release: v1.20
-  file: test/e2e/apimachinery/events.go
 - testname: Garbage Collector, delete deployment,  propagation policy background
   codename: '[sig-api-machinery] Garbage collector should delete RS created by deployment
     when not orphaning [Conformance]'
@@ -1058,6 +1043,21 @@
     show up when listing all events.
   release: v1.19
   file: test/e2e/instrumentation/events.go
+- testname: Event, delete a collection
+  codename: '[sig-instrumentation] Events should delete a collection of events [Conformance]'
+  description: A set of events is created with a label selector which MUST be found
+    when listed. The set of events is deleted and MUST NOT show up when listed by
+    its label selector.
+  release: v1.20
+  file: test/e2e/instrumentation/core_events.go
+- testname: Event resource lifecycle
+  codename: '[sig-instrumentation] Events should ensure that an event can be fetched,
+    patched, deleted, and listed [Conformance]'
+  description: Create an event, the event MUST exist. The event is patched with a
+    new message, the check MUST have the update message. The event is deleted and
+    MUST NOT show up when listing all events.
+  release: v1.20
+  file: test/e2e/instrumentation/core_events.go
 - testname: DNS, cluster
   codename: '[sig-network] DNS should provide /etc/hosts entries for the cluster [LinuxOnly]
     [Conformance]'
diff --git a/test/e2e/apimachinery/events.go b/test/e2e/instrumentation/core_events.go
similarity index 98%
rename from test/e2e/apimachinery/events.go
rename to test/e2e/instrumentation/core_events.go
index 3fdf2ab77f7..2d2b2d565b0 100644
--- a/test/e2e/apimachinery/events.go
+++ b/test/e2e/instrumentation/core_events.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package apimachinery
+package instrumentation
 
 import (
 	"context"
@@ -25,6 +25,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/kubernetes/test/e2e/framework"
+	"k8s.io/kubernetes/test/e2e/instrumentation/common"
 
 	"github.com/onsi/ginkgo"
 	"k8s.io/apimachinery/pkg/types"
@@ -35,7 +36,7 @@ const (
 	eventRetryTimeout = 1 * time.Minute
 )
 
-var _ = SIGDescribe("Events", func() {
+var _ = common.SIGDescribe("Events", func() {
 	f := framework.NewDefaultFramework("events")
 
 	/*