Skip to content

Commit

Permalink
Merge pull request kubernetes#21423 from ihmccreery/version-guard-dep…
Browse files Browse the repository at this point in the history
…loyments

Auto commit by PR queue bot
  • Loading branch information
k8s-merge-robot committed Feb 22, 2016
2 parents 347a509 + 7b26656 commit 6a19970
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions test/e2e/kubectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@ var (
//
// TODO(ihmccreery): remove once we don't care about v1.0 anymore, (tentatively in v1.3).
jobsVersion = version.MustParse("v1.1.0")

// Deployments were introduced by default in v1.2, so we don't expect tests that rely on
// deployments to work on clusters before that.
//
// TODO(ihmccreery): remove once we don't care about v1.1 anymore, (tentatively in v1.4).
deploymentsVersion = version.MustParse("v1.2.0-alpha.7.726")
)

var _ = Describe("Kubectl client", func() {
Expand Down Expand Up @@ -911,6 +917,8 @@ var _ = Describe("Kubectl client", func() {
})

It("should create a deployment from an image [Conformance]", func() {
SkipUnlessServerVersionGTE(deploymentsVersion, c)

image := "nginx"

By("running the image " + image)
Expand Down

0 comments on commit 6a19970

Please sign in to comment.