From a3a650f2460ed7488167bf7e8bf1d5111a3d5085 Mon Sep 17 00:00:00 2001
From: Benjamin Elder <bentheelder@google.com>
Date: Tue, 23 Feb 2021 17:41:27 -0800
Subject: [PATCH] don't default to building conformance image for fastbuilds
 (quick-release)

continue defaulting to building it for release builds
---
 build/lib/release.sh | 2 +-
 build/root/Makefile  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/lib/release.sh b/build/lib/release.sh
index 6e8e1ab2453..a18174456f8 100644
--- a/build/lib/release.sh
+++ b/build/lib/release.sh
@@ -28,7 +28,7 @@ readonly RELEASE_STAGE="${LOCAL_OUTPUT_ROOT}/release-stage"
 readonly RELEASE_TARS="${LOCAL_OUTPUT_ROOT}/release-tars"
 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}
 
 # Validate a ci version
diff --git a/build/root/Makefile b/build/root/Makefile
index b1fac2b89eb..11af1ec9213 100644
--- a/build/root/Makefile
+++ b/build/root/Makefile
@@ -404,6 +404,7 @@ ifeq ($(PRINT_HELP),y)
 release release-in-a-container:
 	@echo "$$RELEASE_HELP_INFO"
 else
+release release-in-a-container: KUBE_BUILD_CONFORMANCE = y
 release:
 	build/release.sh
 release-in-a-container:
@@ -421,6 +422,7 @@ define RELEASE_IMAGES_HELP_INFO
 endef
 .PHONY: release-images
 ifeq ($(PRINT_HELP),y)
+release-images: KUBE_BUILD_CONFORMANCE = y
 release-images:
 	@echo "$$RELEASE_IMAGES_HELP_INFO"
 else
@@ -457,7 +459,7 @@ define QUICK_RELEASE_IMAGES_HELP_INFO
 #
 # Args:
 #   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:
 #   make quick-release-images