Merge pull request #64472 from yujuhong/tag-pod-cgroup-test

Automatic merge from submit-queue (batch tested with PRs 64456, 64457, 64472). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. e2e node: mark pod cgroup test as [NodeConformance] **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #64472 from yujuhong/tag-pod-cgroup-test
57b8fda9 · Kubernetes Submit Queue · GitHub · ea82e932 · a48008f5 · 57b8fda9
Unverified Commit 57b8fda9 authored May 29, 2018 by Kubernetes Submit Queue Committed by GitHub May 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

pods_container_manager_test.go test/e2e_node/pods_container_manager_test.go +1 -1

No files found.
--- a/test/e2e_node/pods_container_manager_test.go
+++ b/test/e2e_node/pods_container_manager_test.go
@@ -152,7 +152,7 @@ var _ = framework.KubeDescribe("Kubelet Cgroup Manager", func() {
 	f := framework.NewDefaultFramework("kubelet-cgroup-manager")
 	Describe("QOS containers", func() {
 		Context("On enabling QOS cgroup hierarchy", func() {
-			It("Top level QoS containers should have been created", func() {
+			It("Top level QoS containers should have been created [NodeConformance]", func() {
 				if !framework.TestContext.KubeletConfig.CgroupsPerQOS {
 					return
 				}