Skip building release archives during RPM build

Author: smarterclayton

Makefile

@@ -251,7 +251,6 @@ official-release: build-images build-cross
 # Example:
 #   make release
 release: build-images
-	hack/extract-release.sh
 .PHONY: release
 
 # Build the cross compiled release binaries

hack/build-cross.sh

@@ -82,17 +82,25 @@ os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}"
 OS_BUILD_PLATFORMS=("${test_platforms[@]+"${test_platforms[@]}"}")
 os::build::build_binaries "${OS_TEST_TARGETS[@]}"
 
-# Make the primary client/server release.
-OS_BUILD_PLATFORMS=("${platforms[@]+"${platforms[@]}"}")
-OS_RELEASE_ARCHIVE="openshift-origin" \
-  os::build::place_bins "${OS_CROSS_COMPILE_BINARIES[@]}"
-
-# Make the image binaries release.
-OS_BUILD_PLATFORMS=("${image_platforms[@]+"${image_platforms[@]}"}")
-OS_RELEASE_ARCHIVE="openshift-origin-image" \
-  os::build::place_bins "${OS_IMAGE_COMPILE_BINARIES[@]}"
-
-os::build::release_sha
+if [[ "${OS_BUILD_RELEASE_ARCHIVES-}" != "n" ]]; then
+  # Make the primary client/server release.
+  OS_BUILD_PLATFORMS=("${platforms[@]+"${platforms[@]}"}")
+  OS_RELEASE_ARCHIVE="openshift-origin" \
+    os::build::place_bins "${OS_CROSS_COMPILE_BINARIES[@]}"
+
+  # Make the image binaries release.
+  OS_BUILD_PLATFORMS=("${image_platforms[@]+"${image_platforms[@]}"}")
+  OS_RELEASE_ARCHIVE="openshift-origin-image" \
+    os::build::place_bins "${OS_IMAGE_COMPILE_BINARIES[@]}"
+
+  os::build::release_sha
+else
+  # Place binaries only
+  OS_BUILD_PLATFORMS=("${platforms[@]+"${platforms[@]}"}") \
+    os::build::place_bins "${OS_CROSS_COMPILE_BINARIES[@]}"
+  OS_BUILD_PLATFORMS=("${image_platforms[@]+"${image_platforms[@]}"}") \
+    os::build::place_bins "${OS_IMAGE_COMPILE_BINARIES[@]}"
+fi
 
 if [[ "${OS_GIT_TREE_STATE:-dirty}" == "clean"  ]]; then
 	# only when we are building from a clean state can we claim to

origin.spec

@@ -240,7 +240,7 @@ of docker.  Exclude those versions of docker.
 %if 0%{do_build}
 %if 0%{make_redistributable}
 # Create Binaries for all supported arches
-%{os_git_vars} hack/build-cross.sh
+%{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n hack/build-cross.sh
 %{os_git_vars} hack/build-go.sh vendor/github.com/onsi/ginkgo/ginkgo
 %{os_git_vars} unset GOPATH; cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/build-cross.sh
 %{os_git_vars} unset GOPATH; cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/hack/build-cross.sh
@@ -261,7 +261,7 @@ of docker.  Exclude those versions of docker.
 %ifarch s390x
   BUILD_PLATFORM="linux/s390x"
 %endif
-OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} hack/build-cross.sh
+OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} OS_BUILD_RELEASE_ARCHIVES=n hack/build-cross.sh
 OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} hack/build-go.sh vendor/github.com/onsi/ginkgo/ginkgo
 OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} unset GOPATH; cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/build-cross.sh
 OS_ONLY_BUILD_PLATFORMS="${BUILD_PLATFORM}" %{os_git_vars} unset GOPATH; cmd/cluster-capacity/go/src/github.com/kubernetes-incubator/cluster-capacity/hack/build-cross.sh