diff --git a/test/conformance/BUILD b/test/conformance/BUILD index 7c11b84663c..828fb29402b 100644 --- a/test/conformance/BUILD +++ b/test/conformance/BUILD @@ -30,9 +30,12 @@ filegroup( genrule( name = "list_conformance_tests", - srcs = ["//test/e2e:all-srcs"], + srcs = [ + "//test/e2e:all-srcs", + "//test/e2e_node:all-srcs", + ], outs = ["conformance.txt"], - cmd = "./$(location :conformance) $(locations //test/e2e:all-srcs) > $@", + cmd = "./$(location :conformance) $(locations //test/e2e:all-srcs) $(locations //test/e2e_node:all-srcs) > $@", message = "Listing all conformance tests.", tools = [":conformance"], ) diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index a1b79a138ff..c5f8ec63dbf 100755 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -148,3 +148,13 @@ test/e2e/node/pre_stop.go: "should call prestop when killing a pod " test/e2e/scheduling/predicates.go: "validates resource limits of pods that are allowed to run " test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if not matching " test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if matching " +test/e2e_node/kubelet_test.go: "it should print the output to logs" +test/e2e_node/kubelet_test.go: "it should not write to root filesystem" +test/e2e_node/lifecycle_hook_test.go: "should execute poststart exec hook properly" +test/e2e_node/lifecycle_hook_test.go: "should execute prestop exec hook properly" +test/e2e_node/lifecycle_hook_test.go: "should execute poststart http hook properly" +test/e2e_node/lifecycle_hook_test.go: "should execute prestop http hook properly" +test/e2e_node/mirror_pod_test.go: "should be updated when static pod updated" +test/e2e_node/mirror_pod_test.go: "should be recreated when mirror pod gracefully deleted" +test/e2e_node/mirror_pod_test.go: "should be recreated when mirror pod forcibly deleted" +test/e2e_node/runtime_conformance_test.go: "it should run with the expected status" diff --git a/test/e2e_node/kubelet_test.go b/test/e2e_node/kubelet_test.go index d727b92eb7f..9347d2d183d 100644 --- a/test/e2e_node/kubelet_test.go +++ b/test/e2e_node/kubelet_test.go @@ -39,7 +39,7 @@ var _ = framework.KubeDescribe("Kubelet", func() { }) Context("when scheduling a busybox command in a pod", func() { podName := "busybox-scheduling-" + string(uuid.NewUUID()) - It("it should print the output to logs [Conformance]", func() { + framework.ConformanceIt("it should print the output to logs", func() { podClient.CreateSync(&v1.Pod{ ObjectMeta: metav1.ObjectMeta{ Name: podName, @@ -164,7 +164,7 @@ var _ = framework.KubeDescribe("Kubelet", func() { }) Context("when scheduling a read only busybox container", func() { podName := "busybox-readonly-fs" + string(uuid.NewUUID()) - It("it should not write to root filesystem [Conformance]", func() { + framework.ConformanceIt("it should not write to root filesystem", func() { isReadOnly := true podClient.CreateSync(&v1.Pod{ ObjectMeta: metav1.ObjectMeta{ diff --git a/test/e2e_node/lifecycle_hook_test.go b/test/e2e_node/lifecycle_hook_test.go index a8c49a19ed6..9eae7891ef8 100644 --- a/test/e2e_node/lifecycle_hook_test.go +++ b/test/e2e_node/lifecycle_hook_test.go @@ -84,7 +84,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { }, preStopWaitTimeout, podCheckInterval).Should(BeNil()) } } - It("should execute poststart exec hook properly [Conformance]", func() { + framework.ConformanceIt("should execute poststart exec hook properly", func() { lifecycle := &v1.Lifecycle{ PostStart: &v1.Handler{ Exec: &v1.ExecAction{ @@ -95,7 +95,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { podWithHook := getPodWithHook("pod-with-poststart-exec-hook", imageutils.GetE2EImage(imageutils.Hostexec), lifecycle) testPodWithHook(podWithHook) }) - It("should execute prestop exec hook properly [Conformance]", func() { + framework.ConformanceIt("should execute prestop exec hook properly", func() { lifecycle := &v1.Lifecycle{ PreStop: &v1.Handler{ Exec: &v1.ExecAction{ @@ -106,7 +106,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { podWithHook := getPodWithHook("pod-with-prestop-exec-hook", imageutils.GetE2EImage(imageutils.Hostexec), lifecycle) testPodWithHook(podWithHook) }) - It("should execute poststart http hook properly [Conformance]", func() { + framework.ConformanceIt("should execute poststart http hook properly", func() { lifecycle := &v1.Lifecycle{ PostStart: &v1.Handler{ HTTPGet: &v1.HTTPGetAction{ @@ -119,7 +119,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { podWithHook := getPodWithHook("pod-with-poststart-http-hook", framework.GetPauseImageNameForHostArch(), lifecycle) testPodWithHook(podWithHook) }) - It("should execute prestop http hook properly [Conformance]", func() { + framework.ConformanceIt("should execute prestop http hook properly", func() { lifecycle := &v1.Lifecycle{ PreStop: &v1.Handler{ HTTPGet: &v1.HTTPGetAction{ diff --git a/test/e2e_node/mirror_pod_test.go b/test/e2e_node/mirror_pod_test.go index 5f2a4030223..6794cfcf598 100644 --- a/test/e2e_node/mirror_pod_test.go +++ b/test/e2e_node/mirror_pod_test.go @@ -57,7 +57,7 @@ var _ = framework.KubeDescribe("MirrorPod", func() { return checkMirrorPodRunning(f.ClientSet, mirrorPodName, ns) }, 2*time.Minute, time.Second*4).Should(BeNil()) }) - It("should be updated when static pod updated [Conformance]", func() { + framework.ConformanceIt("should be updated when static pod updated", func() { By("get mirror pod uid") pod, err := f.ClientSet.CoreV1().Pods(ns).Get(mirrorPodName, metav1.GetOptions{}) Expect(err).ShouldNot(HaveOccurred()) @@ -79,7 +79,7 @@ var _ = framework.KubeDescribe("MirrorPod", func() { Expect(len(pod.Spec.Containers)).Should(Equal(1)) Expect(pod.Spec.Containers[0].Image).Should(Equal(image)) }) - It("should be recreated when mirror pod gracefully deleted [Conformance]", func() { + framework.ConformanceIt("should be recreated when mirror pod gracefully deleted", func() { By("get mirror pod uid") pod, err := f.ClientSet.CoreV1().Pods(ns).Get(mirrorPodName, metav1.GetOptions{}) Expect(err).ShouldNot(HaveOccurred()) @@ -94,7 +94,7 @@ var _ = framework.KubeDescribe("MirrorPod", func() { return checkMirrorPodRecreatedAndRunnig(f.ClientSet, mirrorPodName, ns, uid) }, 2*time.Minute, time.Second*4).Should(BeNil()) }) - It("should be recreated when mirror pod forcibly deleted [Conformance]", func() { + framework.ConformanceIt("should be recreated when mirror pod forcibly deleted", func() { By("get mirror pod uid") pod, err := f.ClientSet.CoreV1().Pods(ns).Get(mirrorPodName, metav1.GetOptions{}) Expect(err).ShouldNot(HaveOccurred()) diff --git a/test/e2e_node/runtime_conformance_test.go b/test/e2e_node/runtime_conformance_test.go index 426e06ba3c7..a616dd9b1e1 100644 --- a/test/e2e_node/runtime_conformance_test.go +++ b/test/e2e_node/runtime_conformance_test.go @@ -46,7 +46,7 @@ var _ = framework.KubeDescribe("Container Runtime Conformance Test", func() { Describe("container runtime conformance blackbox test", func() { Context("when starting a container that exits", func() { - It("it should run with the expected status [Conformance]", func() { + framework.ConformanceIt("it should run with the expected status", func() { restartCountVolumeName := "restart-count" restartCountVolumePath := "/restart-count" testContainer := v1.Container{