From 633bdf1ed8e58f691a52d4879fa675c49cbef3d8 Mon Sep 17 00:00:00 2001 From: jupierce Date: Thu, 10 Aug 2017 08:38:58 -0400 Subject: [PATCH] Change to include -RELEASE in OS_GIT_VERSION --- .tito/lib/origin/common.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.tito/lib/origin/common.py b/.tito/lib/origin/common.py index 7ebfd921c60f..9aa594167796 100644 --- a/.tito/lib/origin/common.py +++ b/.tito/lib/origin/common.py @@ -41,7 +41,11 @@ def get_os_git_vars(): # but that will not have changed any of the source used for the product # release and we therefore don't want that reflected in the release version git_vars["OS_GIT_TREE_STATE"] = "clean" - git_vars["OS_GIT_VERSION"] = git_vars["OS_GIT_VERSION"].split('-')[0].split('+')[0] + + # To derive the correct tag for images in 3.7 and beyond, + # oc version must include Release information. Any +metadata can be removed. + git_vars["OS_GIT_VERSION"] = git_vars["OS_GIT_VERSION"].split('+')[0] + # Buildtime variables required to change origin to atomic-openshift git_vars["OS_BUILD_LDFLAGS_DEFAULT_IMAGE_STREAMS"] = "rhel7" git_vars["OS_IMAGE_PREFIX"] = "registry.access.redhat.com/openshift3/ose"