github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39257 from euank/makefile-specify-release-flags

Browse Source 
Automatic merge from submit-queue

make: allow overriding quick-release opts

Prior to this change, `make quick-release KUBE_RELEASE_RUN_TESTS=y`
would still not run the tests. This change makes it so such overriding
works.

It also specifies the options as variables, which helps some shells with
tab-completion.

Finally, I plan to add a new "quick-release" option that not everyone will want on in #35249 (`RELEASE_HYPERKUBE_ONLY`), and this sets the needed groundwork to make such an "opt-in for quickness" flag possible.

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-02-20 14:48:39 -08:00 committed by GitHub
commit 6a65964d0e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -53,6 +53,10 @@ KUBE_GOFLAGS := $(GOFLAGS)
KUBE_GOLDFLAGS := $(GOLDFLAGS) KUBE_GOLDFLAGS := $(GOLDFLAGS)
KUBE_GOGCFLAGS = $(GOGCFLAGS) KUBE_GOGCFLAGS = $(GOGCFLAGS)
# Extra options for the release or quick-release options:
KUBE_RELEASE_RUN_TESTS := $(KUBE_RELEASE_RUN_TESTS)
KUBE_FASTBUILD := $(KUBE_FASTBUILD)
# This controls the verbosity of the build. Higher numbers mean more output. # This controls the verbosity of the build. Higher numbers mean more output.
KUBE_VERBOSE ?= 1 KUBE_VERBOSE ?= 1
@ -350,17 +354,23 @@ endif
define RELEASE_SKIP_TESTS_HELP_INFO define RELEASE_SKIP_TESTS_HELP_INFO
# Build a release, but skip tests # Build a release, but skip tests
#
# Args:
# KUBE_RELEASE_RUN_TESTS: Whether to run tests. Set to 'y' to run tests anyways.
# KUBE_FASTBUILD: Whether to cross-compile for other architectures. Set to 'true' to do so.
# #
# Example: # Example:
# make release-skip-tests # make release-skip-tests
# make quick-release
endef endef
.PHONY: release-skip-tests quick-release .PHONY: release-skip-tests quick-release
ifeq ($(PRINT_HELP),y) ifeq ($(PRINT_HELP),y)
release-skip-tests quick-release: release-skip-tests quick-release:
@echo "$$RELEASE_SKIP_TESTS_HELP_INFO" @echo "$$RELEASE_SKIP_TESTS_HELP_INFO"
else else
release-skip-tests quick-release: KUBE_RELEASE_RUN_TESTS = n KUBE_FASTBUILD = true
release-skip-tests quick-release: release-skip-tests quick-release:
KUBE_RELEASE_RUN_TESTS=n KUBE_FASTBUILD=true build/release.sh build/release.sh
endif endif
define CROSS_HELP_INFO define CROSS_HELP_INFO