a) fixing rebase

test/conformance/testdata/conformance.txt

@@ -185,9 +185,3 @@ test/e2e/storage/subpath.go: "should support subpaths with configmap pod"
 test/e2e/storage/subpath.go: "should support subpaths with configmap pod with mountPath of existing file"
 test/e2e/storage/subpath.go: "should support subpaths with downward pod"
 test/e2e/storage/subpath.go: "should support subpaths with projected pod"
-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/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"
\ No newline at end of file

test/e2e/common/lifecycle_hook.go

@@ -89,7 +89,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
 			Testname: Pod Lifecycle, post start exec hook
 			Description: When a post start handler is specified in the container lifecycle using a ‘Exec’ action, then the handler MUST be invoked after the start of the container. A server pod is created that will serve http requests, create a second pod with a container lifecycle specifying a post start that invokes the server pod using ExecAction to validate that the post start is executed.
 		*/
-		It("should execute poststart exec hook properly [NodeConformance]", func() {
+		framework.ConformanceIt("should execute poststart exec hook properly [NodeConformance]", func() {
 			lifecycle := &v1.Lifecycle{
 				PostStart: &v1.Handler{
 					Exec: &v1.ExecAction{
@@ -105,7 +105,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
 			Testname: Pod Lifecycle, prestop exec hook
 			Description: When a pre-stop handler is specified in the container lifecycle using a ‘Exec’ action, then the handler MUST be invoked before the container is terminated. A server pod is created that will serve http requests, create a second pod with a container lifecycle specifying a pre-stop that invokes the server pod using ExecAction to validate that the pre-stop is executed.
 		*/
-		It("should execute prestop exec hook properly [NodeConformance]", func() {
+		framework.ConformanceIt("should execute prestop exec hook properly [NodeConformance]", func() {
 			lifecycle := &v1.Lifecycle{
 				PreStop: &v1.Handler{
 					Exec: &v1.ExecAction{
@@ -121,7 +121,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
 			Testname: Pod Lifecycle, post start http hook
 			Description: When a post start handler is specified in the container lifecycle using a HttpGet action, then the handler MUST be invoked after the start of the container. A server pod is created that will serve http requests, create a second pod with a container lifecycle specifying a post start that invokes the server pod to validate that the post start is executed.
 		*/
-		It("should execute poststart http hook properly [NodeConformance]", func() {
+		framework.ConformanceIt("should execute poststart http hook properly [NodeConformance]", func() {
 			lifecycle := &v1.Lifecycle{
 				PostStart: &v1.Handler{
 					HTTPGet: &v1.HTTPGetAction{
@@ -139,7 +139,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
 			Testname: Pod Lifecycle, prestop http hook
 			Description: When a pre-stop handler is specified in the container lifecycle using a ‘HttpGet’ action, then the handler MUST be invoked before the container is terminated. A server pod is created that will serve http requests, create a second pod with a container lifecycle specifying a pre-stop that invokes the server pod to validate that the pre-stop is executed.
 		*/
-		It("should execute prestop http hook properly [NodeConformance]", func() {
+		framework.ConformanceIt("should execute prestop http hook properly [NodeConformance]", func() {
 			lifecycle := &v1.Lifecycle{
 				PreStop: &v1.Handler{
 					HTTPGet: &v1.HTTPGetAction{