catalog: add versioning for release build

Currently the version is derived from the upstream service catalog tag.

also adds build date in ldflags

Author: Jeff Peeler

.tito/lib/origin/common.py

@@ -31,7 +31,7 @@ def get_os_git_vars():
     shell utilities. The git tree state is spoofed.
     """
     git_vars = {}
-    for var in ["COMMIT", "VERSION", "MAJOR", "MINOR"]:
+    for var in ["COMMIT", "VERSION", "MAJOR", "MINOR", "CATALOG_VERSION"]:
         var_name = "OS_GIT_{}".format(var)
         git_vars[var_name] = run_command(
             "bash -c 'source ./hack/lib/init.sh; os::build::version::openshift_vars; echo ${}'".format(var_name)

hack/lib/build/version.sh

@@ -26,6 +26,21 @@ readonly -f os::build::version::get_vars
 function os::build::version::openshift_vars() {
 	local git=(git --work-tree "${OS_ROOT}")
 
+	if [[ -z "${OS_GIT_CATALOG_VERSION:-}" ]]; then
+		# search git merge commits for template text and extract version
+		# subject template: Merge version v0.0.14 of Service Catalog from https://github.com/openshift/service-catalog:v0.0.14+origin
+		summary_text="$(${git[@]} log --merges --grep "Merge version v.* of Service Catalog from https://github.com/openshift/service-catalog" --pretty=%s -1)"
+		if [[ "${summary_text}" =~ Merge[[:space:]]version[[:space:]](v.*)[[:space:]]of[[:space:]]Service[[:space:]]Catalog ]]; then
+			OS_GIT_CATALOG_VERSION="${BASH_REMATCH[1]}"
+		else
+			os::log::fatal "Unable to find version for service catalog - (this should never happen)"
+		fi
+
+		if git_status=$("${git[@]}" status --porcelain cmd/service-catalog 2>/dev/null) && [[ -n ${git_status} ]]; then
+			OS_GIT_CATALOG_VERSION+="dirty"
+		fi
+	fi
+
 	if [[ -n ${OS_GIT_COMMIT-} ]] || OS_GIT_COMMIT=$("${git[@]}" rev-parse --short "HEAD^{commit}" 2>/dev/null); then
 		if [[ -z ${OS_GIT_TREE_STATE-} ]]; then
 			# Check if the tree is dirty.  default to dirty

origin.spec

@@ -26,7 +26,7 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 # os_git_vars needed to run hack scripts during rpm builds
 %{!?os_git_vars:
-%global os_git_vars OS_GIT_VERSION='' OS_GIT_COMMIT='' OS_GIT_MAJOR='' OS_GIT_MINOR='' OS_GIT_TREE_STATE=''
+%global os_git_vars OS_GIT_VERSION='' OS_GIT_COMMIT='' OS_GIT_MAJOR='' OS_GIT_MINOR='' OS_GIT_TREE_STATE='' OS_GIT_CATALOG_VERSION=''
 }
 
 %if 0%{?fedora} || 0%{?epel}