From 23eba2524e87b5783bfc3d93162309250d5658fe Mon Sep 17 00:00:00 2001
From: Luke Powlett <luke.powlett@ibm.com>
Date: Wed, 7 Oct 2020 14:32:55 +0100
Subject: [PATCH] Tag master builds with build id

---
 .travis.yml |  8 +++-----
 Makefile    | 27 +++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ca2aae3..818dc11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,6 @@ go_import_path: "github.com/ibm-messaging/mq-container"
 #   directories:
 #     - downloads
 
-env:
-  global:
-    - RELEASE=""
-
 jobs:
   include:
     - stage: basic-build
@@ -70,9 +66,11 @@ jobs:
         - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
         - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_S390X
         - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_S390X
+        - RELEASE=""
+        - RELEASE_CANDIDATE=""
       script: bash -e travis-build-scripts/run.sh
     - stage: push-manifest
-      if: branch = private-master OR tag =~ ^release-candidate*
+      if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
       name: "Push Manifest-list to registry"
       script: make push-manifest
 before_install:
diff --git a/Makefile b/Makefile
index 0454ef5..c261a9e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,8 @@
 ###############################################################################
 # RELEASE shows what release of the container code has been built
 RELEASE ?=
+# RELEASE_CANDIDATE shows what release candidate of the container code has been built
+RELEASE_CANDIDATE ?=
 # MQ_VERSION is the fully qualified MQ version number to build
 MQ_VERSION ?= 9.2.0.0
 # MQ_ARCHIVE_REPOSITORY is a remote repository from which to pull the MQ_ARCHIVE (if required)
@@ -112,11 +114,32 @@ else
 	MQ_DELIVERY_REGISTRY_FULL_PATH=$(MQ_DELIVERY_REGISTRY_HOSTNAME)
 endif
 
+# image tagging
+
 ifneq "$(RELEASE)" "$(EMPTY)"
-	MQ_TAG=$(MQ_VERSION)-$(RELEASE)-$(ARCH)
+	MQ_TAG=$(MQ_VERSION)-$(RELEASE)-$(ARCH)-$(RELEASE_CANDIDATE)
 	EXTRA_LABELS=--label release=$(RELEASE)
-	MQ_MANIFEST_TAG=$(MQ_VERSION)-$(RELEASE)
+	MQ_MANIFEST_TAG=$(MQ_VERSION)-$(RELEASE)-$(RELEASE_CANDIDATE)
 endif
+
+CURRENT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
+
+ifeq "$(TIMESTAMPFLAT)" "$(EMPTY)"
+	TIMESTAMPFLAT=$(shell date "+%Y%m%d%H%M%S")
+endif
+
+ifeq "$(GIT_COMMIT)" "$(EMPTY)"
+	GIT_COMMIT=$(shell git rev-parse --short HEAD)
+endif
+
+ifeq ($(shell [ ! -z $(TRAVIS) ] && [ "$(TRAVIS_PULL_REQUEST)" != "true" ] && [ "$(CURRENT_BRANCH)" == "private-master" ] && echo true), true)
+	RELEASE_TAG=$(shell [ -z "$(RELEASE)" ] || echo "-$(RELEASE)-$(RELEASE_CANDIDATE)")
+	MQ_TAG=$(MQ_VERSION)$(RELEASE_TAG)-$(ARCH).$(TIMESTAMPFLAT).$(GIT_COMMIT)
+	MQ_MANIFEST_TAG=$(MQ_VERSION)$(RELEASE_TAG).$(TIMESTAMPFLAT).$(GIT_COMMIT)
+endif
+
+# end image tagging
+
 MQ_IMAGE_FULL_RELEASE_NAME=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)
 MQ_IMAGE_DEV_FULL_RELEASE_NAME=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG)