From 7af0011884d9a41ff8ecc5d379b672bc9f5a70b2 Mon Sep 17 00:00:00 2001 From: "Julian V. Modesto" Date: Wed, 22 Apr 2020 12:39:44 -0400 Subject: [PATCH] Promote diff and dry-run to conformance --- test/conformance/testdata/conformance.yaml | 17 +++++++++++++++++ test/e2e/kubectl/kubectl.go | 8 ++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index f0deb7acd7b..8fe4bb62f88 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1351,6 +1351,14 @@ proper information. release: v1.9 file: test/e2e/kubectl/kubectl.go +- testname: Kubectl, diff Deployment + codename: '[sig-cli] Kubectl client Kubectl diff should check if kubectl diff finds + a difference for Deployments [Conformance]' + description: Create a Deployment with httpd image. Declare the same Deployment with + a different image, busybox. Diff of live Deployment with declared Deployment MUST + include the difference between live and declared image. + release: v1.19 + file: test/e2e/kubectl/kubectl.go - testname: Kubectl, create service, replication controller codename: '[sig-cli] Kubectl client Kubectl expose should create services for rc [Conformance]' description: Create a Pod running agnhost listening to port 6379. Using kubectl @@ -1408,6 +1416,15 @@ with one container running the specified image. release: v1.9 file: test/e2e/kubectl/kubectl.go +- testname: Kubectl, server-side dry-run Pod + codename: '[sig-cli] Kubectl client Kubectl server-side dry-run should check if + kubectl can dry-run update Pods [Conformance]' + description: The command 'kubectl run' must create a pod with the specified image + name. After, the command 'kubectl replace --dry-run=server' should update the + Pod with the new image name and server-side dry-run enabled. The image name must + not change. + release: v1.19 + file: test/e2e/kubectl/kubectl.go - testname: Kubectl, version codename: '[sig-cli] Kubectl client Kubectl version should check is all data is printed [Conformance]' diff --git a/test/e2e/kubectl/kubectl.go b/test/e2e/kubectl/kubectl.go index f0e1195a312..17a79b1c895 100644 --- a/test/e2e/kubectl/kubectl.go +++ b/test/e2e/kubectl/kubectl.go @@ -857,11 +857,11 @@ metadata: ginkgo.Describe("Kubectl diff", func() { /* - Release : v1.18 + Release : v1.19 Testname: Kubectl, diff Deployment Description: Create a Deployment with httpd image. Declare the same Deployment with a different image, busybox. Diff of live Deployment with declared Deployment MUST include the difference between live and declared image. */ - ginkgo.It("should find diff in Deployment", func() { + framework.ConformanceIt("should check if kubectl diff finds a difference for Deployments", func() { ginkgo.By("create deployment with httpd image") deployment := commonutils.SubstituteImageName(string(readTestFileOrDie(httpdDeployment3Filename))) framework.RunKubectlOrDieInput(ns, deployment, "create", "-f", "-") @@ -888,11 +888,11 @@ metadata: ginkgo.Describe("Kubectl server-side dry-run", func() { /* - Release : v1.18 + Release : v1.19 Testname: Kubectl, server-side dry-run Pod Description: The command 'kubectl run' must create a pod with the specified image name. After, the command 'kubectl replace --dry-run=server' should update the Pod with the new image name and server-side dry-run enabled. The image name must not change. */ - ginkgo.It("should dry-run update the Pod", func() { + framework.ConformanceIt("should check if kubectl can dry-run update Pods", func() { ginkgo.By("running the image " + httpdImage) podName := "e2e-test-httpd-pod" nsFlag := fmt.Sprintf("--namespace=%v", ns)