Code Review
/
validation.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Change the criticality of OS security test"
[validation.git]
/
docker
/
kube-conformance
/
Makefile
diff --git
a/docker/kube-conformance/Makefile
b/docker/kube-conformance/Makefile
index
a5b5b99
..
ee7b40f
100644
(file)
--- a/
docker/kube-conformance/Makefile
+++ b/
docker/kube-conformance/Makefile
@@
-15,16
+15,20
@@
##############################################################################
export WORK_DIR?=$(TAG_PRE)
##############################################################################
export WORK_DIR?=$(TAG_PRE)
-export TAG_VER?=v1.11
+export KUBE_VERSION=1.16
+export TAG_VER?=v$(KUBE_VERSION)
.PHONY: .build
.build:: .submodules_patched
$(MAKE) -C $(TAG_PRE) e2e.test kubectl ginkgo
.PHONY: all
.PHONY: .build
.build:: .submodules_patched
$(MAKE) -C $(TAG_PRE) e2e.test kubectl ginkgo
.PHONY: all
-all:
.push_
image .push_manifest
+all:
push-
image .push_manifest
.PHONY: build
build: .build
.PHONY: build
build: .build
+.PHONY: push-image
+push-image: .push_image
+
include ../build.mk
include ../build.mk