diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 63669ecec5e..454bd4c3411 100755 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -17,6 +17,11 @@ test/e2e/apps/daemon_set.go: "should run and stop complex daemon" test/e2e/apps/daemon_set.go: "should retry creating failed daemon pods" test/e2e/apps/daemon_set.go: "should update pod when spec was updated and update strategy is RollingUpdate" test/e2e/apps/daemon_set.go: "should rollback without unnecessary restarts" +test/e2e/apps/deployment.go: "RollingUpdateDeployment should delete old pods and create new ones" +test/e2e/apps/deployment.go: "RecreateDeployment should delete old pods and create new ones" +test/e2e/apps/deployment.go: "deployment should delete old replica sets" +test/e2e/apps/deployment.go: "deployment should support rollover" +test/e2e/apps/deployment.go: "deployment should support proportional scaling" test/e2e/apps/rc.go: "should serve a basic image on each replica with a public image" test/e2e/apps/replica_set.go: "should serve a basic image on each replica with a public image" test/e2e/apps/statefulset.go: "should perform rolling updates and roll backs of template modifications" diff --git a/test/e2e/apps/deployment.go b/test/e2e/apps/deployment.go index d8e89d5cb38..33d72da5396 100644 --- a/test/e2e/apps/deployment.go +++ b/test/e2e/apps/deployment.go @@ -70,16 +70,35 @@ var _ = SIGDescribe("Deployment", func() { It("deployment reaping should cascade to its replica sets and pods", func() { testDeleteDeployment(f) }) - It("RollingUpdateDeployment should delete old pods and create new ones", func() { + /* + Testname: Deployment RollingUpdate + Description: A conformant Kubernetes distribution MUST support the Deployment with RollingUpdate strategy. + */ + framework.ConformanceIt("RollingUpdateDeployment should delete old pods and create new ones", func() { testRollingUpdateDeployment(f) }) - It("RecreateDeployment should delete old pods and create new ones", func() { + /* + Testname: Deployment Recreate + Description: A conformant Kubernetes distribution MUST support the Deployment with Recreate strategy. + */ + framework.ConformanceIt("RecreateDeployment should delete old pods and create new ones", func() { testRecreateDeployment(f) }) - It("deployment should delete old replica sets", func() { + /* + Testname: Deployment RevisionHistoryLimit + Description: A conformant Kubernetes distribution MUST clean up Deployment's ReplicaSets based on + the Deployment's `.spec.revisionHistoryLimit`. + */ + framework.ConformanceIt("deployment should delete old replica sets", func() { testDeploymentCleanUpPolicy(f) }) - It("deployment should support rollover", func() { + /* + Testname: Deployment Rollover + Description: A conformant Kubernetes distribution MUST support Deployment rollover, + i.e. allow arbitrary number of changes to desired state during rolling update + before the rollout finishes. + */ + framework.ConformanceIt("deployment should support rollover", func() { testRolloverDeployment(f) }) It("deployment should support rollback", func() { @@ -91,7 +110,13 @@ var _ = SIGDescribe("Deployment", func() { It("test Deployment ReplicaSet orphaning and adoption regarding controllerRef", func() { testDeploymentsControllerRef(f) }) - It("deployment should support proportional scaling", func() { + /* + Testname: Deployment Proportional Scaling + Description: A conformant Kubernetes distribution MUST support Deployment + proportional scaling, i.e. proportionally scale a Deployment's ReplicaSets + when a Deployment is scaled. + */ + framework.ConformanceIt("deployment should support proportional scaling", func() { testProportionalScalingDeployment(f) }) // TODO: add tests that cover deployment.Spec.MinReadySeconds once we solved clock-skew issues