github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-06 11:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99386 from BenTheElder/conformance-on-release

Browse Source 
don't default to building conformance image for fastbuilds (quick-rel…
This commit is contained in:
Kubernetes Prow Robot
2021-02-26 14:50:46 -08:00
committed by GitHub
parent 1428969a73 a3a650f246
commit 5491484aa9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/lib/release.sh
View File

@@ -28,7 +28,7 @@ readonly RELEASE_STAGE="${LOCAL_OUTPUT_ROOT}/release-stage"
readonly RELEASE_TARS="${LOCAL_OUTPUT_ROOT}/release-tars" readonly RELEASE_TARS="${LOCAL_OUTPUT_ROOT}/release-tars"
readonly RELEASE_IMAGES="${LOCAL_OUTPUT_ROOT}/release-images" readonly RELEASE_IMAGES="${LOCAL_OUTPUT_ROOT}/release-images"
KUBE_BUILD_CONFORMANCE=${KUBE_BUILD_CONFORMANCE:-y} KUBE_BUILD_CONFORMANCE=${KUBE_BUILD_CONFORMANCE:-n}
KUBE_BUILD_PULL_LATEST_IMAGES=${KUBE_BUILD_PULL_LATEST_IMAGES:-y} KUBE_BUILD_PULL_LATEST_IMAGES=${KUBE_BUILD_PULL_LATEST_IMAGES:-y}
# Validate a ci version # Validate a ci version

4
build/root/Makefile
View File

@@ -404,6 +404,7 @@ ifeq ($(PRINT_HELP),y)
release release-in-a-container: release release-in-a-container:
@echo "$$RELEASE_HELP_INFO" @echo "$$RELEASE_HELP_INFO"
else else
release release-in-a-container: KUBE_BUILD_CONFORMANCE = y
release: release:
build/release.sh build/release.sh
release-in-a-container: release-in-a-container:
@@ -421,6 +422,7 @@ define RELEASE_IMAGES_HELP_INFO
endef endef
.PHONY: release-images .PHONY: release-images
ifeq ($(PRINT_HELP),y) ifeq ($(PRINT_HELP),y)
release-images: KUBE_BUILD_CONFORMANCE = y
release-images: release-images:
@echo "$$RELEASE_IMAGES_HELP_INFO" @echo "$$RELEASE_IMAGES_HELP_INFO"
else else
@@ -457,7 +459,7 @@ define QUICK_RELEASE_IMAGES_HELP_INFO
# #
# Args: # Args:
# KUBE_FASTBUILD: Whether to cross-compile for other architectures. Set to 'false' to do so. # KUBE_FASTBUILD: Whether to cross-compile for other architectures. Set to 'false' to do so.
# KUBE_BUILD_CONFORMANCE: Whether to build conformance testing image as well. Set to 'n' to skip. # KUBE_BUILD_CONFORMANCE: Whether to build conformance testing image as well. Set to 'y' to do so.
# #
# Example: # Example:
# make quick-release-images # make quick-release-images