Add a make perform-official-release target

Author: smarterclayton

Makefile

@@ -174,6 +174,23 @@ release-binaries: clean
 	hack/extract-release.sh
 .PHONY: release-binaries
 
+# Release the integrated components for OpenShift, logging and metrics.
+#
+# Example:
+#   make release-components
+release-components: clean
+	hack/release-components.sh
+.PHONY: release-components
+
+# Perform an official release. Requires HEAD of the repository to have a matching
+# tag. Will push images that are tagged tagged with the latest release commit.
+#
+# Example:
+#   make perform-official-release
+perform-official-release: | release-binaries release-components
+	OS_PUSH_ALWAYS="1" OS_PUSH_TAG="HEAD" OS_PUSH_LOCAL="1" hack/push-release.sh
+.PHONY: perform-official-release
+
 # Build the cross compiled release binaries
 #
 # Example:

hack/push-release.sh

@@ -20,7 +20,15 @@ cd "${OS_ROOT}"
 # Allow a release to be repushed with a tag
 tag="${OS_PUSH_TAG:-}"
 if [[ -n "${tag}" ]]; then
-  tag=":${tag}"
+  if [[ "${tag}" == "HEAD" ]]; then
+    if [[ "$( git tag --points-at HEAD | wc -l )" -ne 1 ]]; then
+      echo "error: There must be exactly one tag pointing to HEAD to use OS_PUSH_TAG=HEAD"
+      exit 1
+    fi
+    tag=":$( git tag --points-at HEAD)"
+  else
+    tag=":${tag}"
+  fi
 else
   tag=":latest"
 fi
@@ -77,24 +85,22 @@ fi
 # Pull latest in preparation for tagging
 if [[ "${tag}" != ":latest" ]]; then
   if [[ -z "${OS_PUSH_LOCAL-}" ]]; then
-    set -e
     for image in "${images[@]}"; do
       docker pull "${OS_PUSH_BASE_REGISTRY-}${image}:${source_tag}"
     done
-    set +e
   else
     echo "WARNING: Pushing local :${source_tag} images to ${OS_PUSH_BASE_REGISTRY-}*${tag}"
-    echo "  CTRL+C to cancel, or any other key to continue"
-    read
+    if [[ -z "${OS_PUSH_ALWAYS:-}" ]]; then
+      echo "  CTRL+C to cancel, or any other key to continue"
+      read
+    fi
   fi
 fi
 
 if [[ "${OS_PUSH_BASE_REGISTRY-}" != "" || "${tag}" != "" ]]; then
-  set -e
   for image in "${images[@]}"; do
     docker tag -f "${image}:${source_tag}" "${OS_PUSH_BASE_REGISTRY-}${image}${tag}"
   done
-  set +e
 fi
 
 for image in "${images[@]}"; do

hack/release-components.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# This script builds and pushes a release to DockerHub.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+OS_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${OS_ROOT}/hack/lib/init.sh"
+
+# Go to the top of the tree.
+cd "${OS_ROOT}"
+
+tag="${OS_TAG:-}"
+if [[ -z "${tag}" ]]; then
+  if [[ "$( git tag --points-at HEAD | wc -l )" -ne 1 ]]; then
+    echo "error: Specify OS_TAG or ensure the current git HEAD is tagged."
+    exit 1
+  fi
+  tag=":$( git tag --points-at HEAD )"
+fi
+
+# release_component is the standard release pattern for subcomponents
+function release_component() {
+  local STARTTIME=$(date +%s)
+  echo "--- $1 $2 ---"
+  mkdir -p "_output/components"
+  (
+    pushd _output/components/
+    git clone --recursive "$2" "$1" -b "${tag}"
+    OS_TAG="${tag}" hack/release.sh
+  )
+  local ENDTIME=$(date +%s); echo "--- $1 took $(($ENDTIME - $STARTTIME)) seconds ---"
+}
+
+release_component logging https://github.com/openshift/origin-aggregated-logging
+release_component metrics https://github.com/openshift/origin-metrics