Update release scripts

Author: smarterclayton

Makefile

@@ -236,11 +236,19 @@ clean:
 	rm -rf $(OUT_DIR)
 .PHONY: clean
 
+# Build an official release of OpenShift for all platforms and the images that depend on it.
+#
+# Example:
+#   make release
+official-release: build-rpms build-cross
+	hack/build-images.sh
+.PHONY: official-release
+
 # Build a release of OpenShift for linux/amd64 and the images that depend on it.
 #
 # Example:
 #   make release
-release: clean build-rpms
+release: build-rpms
 	hack/build-images.sh
 	hack/extract-release.sh
 .PHONY: release
@@ -249,7 +257,7 @@ release: clean build-rpms
 #
 # Example:
 #   make release-binaries
-release-binaries: clean
+release-binaries:
 	hack/build-release.sh
 	hack/extract-release.sh
 .PHONY: release-binaries
@@ -258,7 +266,7 @@ release-binaries: clean
 #
 # Example:
 #   make build-cross
-build-cross: clean
+build-cross:
 	hack/build-cross.sh
 .PHONY: build-cross
 

hack/lib/build/binaries.sh

@@ -388,7 +388,7 @@ readonly -f os::build::place_bins
 # built release directory.
 function os::build::release_sha() {
   pushd "${OS_OUTPUT_RELEASEPATH}" &> /dev/null
-  sha256sum * > CHECKSUM
+  find . -maxdepth 1 -type f | xargs sha256sum > CHECKSUM
   popd &> /dev/null
 }
 readonly -f os::build::release_sha

hack/release.sh

@@ -19,13 +19,12 @@ commit="$( git rev-parse ${tag} )"
 docker pull "${OS_BUILD_ENV_IMAGE}"
 
 hack/build-base-images.sh
-OS_GIT_COMMIT="${commit}" hack/build-release.sh
-hack/build-images.sh
-OS_PUSH_TAG="${tag}" OS_TAG="" OS_PUSH_LOCAL="1" hack/push-release.sh
+hack/env OS_GIT_COMMIT="${commit}" make official-release
+OS_PUSH_ALWAYS=1 OS_PUSH_TAG="${tag}" OS_TAG="" OS_PUSH_LOCAL="1" hack/push-release.sh
 
 echo
 echo "Pushed ${tag} to DockerHub"
 echo "1. Push tag to GitHub with: git push origin --tags # (ensure you have no extra tags in your environment)"
 echo "2. Create a new release on the releases page and upload the built binaries in _output/local/releases"
 echo "3. Send an email"
-echo
+echo