From bb10e018a589a1806fa0b8956500312572ba533b Mon Sep 17 00:00:00 2001
From: wangyan <wangyan@vmware.com>
Date: Mon, 22 Jan 2018 00:43:00 -0800
Subject: [PATCH] Change harbor build number to drone number plus git commit

---
 Makefile                          | 23 ++++++++---------------
 tests/integration.sh              |  8 ++++++++
 tests/resources/Harbor-Util.robot |  4 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 19eab41f9..d177a3546 100644
--- a/Makefile
+++ b/Makefile
@@ -85,16 +85,9 @@ BUILDBIN=false
 MIGRATORFLAG=false
 
 # version prepare
+VERSIONTAG=dev
 VERSIONFILEPATH=$(CURDIR)
 VERSIONFILENAME=VERSION
-GITCMD=$(shell which git)
-GITTAG=$(GITCMD) describe --tags
-GITTAGVERSION=$(shell git describe --tags || echo UNKNOWN)
-ifeq ($(DEVFLAG), true)
-	VERSIONTAG=dev
-else
-	VERSIONTAG=$(GITTAGVERSION)
-endif
 
 #versions
 REGISTRYVERSION=v2.6.2
@@ -212,13 +205,13 @@ DOCKERSAVE_PARA=$(DOCKERIMAGENAME_ADMINSERVER):$(VERSIONTAG) \
 		$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \
 		vmware/nginx-photon:$(NGINXVERSION) vmware/registry-photon:$(REGISTRYVERSION)-$(VERSIONTAG) \
 		vmware/photon:$(PHOTONVERSION)
-PACKAGE_OFFLINE_PARA=-zcvf harbor-offline-installer-$(GITTAGVERSION).tgz \
+PACKAGE_OFFLINE_PARA=-zcvf harbor-offline-installer-$(VERSIONTAG).tgz \
 		          $(HARBORPKG)/common/templates $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tar.gz \
 				  $(HARBORPKG)/prepare $(HARBORPKG)/NOTICE \
 				  $(HARBORPKG)/LICENSE $(HARBORPKG)/install.sh \
 				  $(HARBORPKG)/harbor.cfg $(HARBORPKG)/$(DOCKERCOMPOSEFILENAME) \
 				  $(HARBORPKG)/ha
-PACKAGE_ONLINE_PARA=-zcvf harbor-online-installer-$(GITTAGVERSION).tgz \
+PACKAGE_ONLINE_PARA=-zcvf harbor-online-installer-$(VERSIONTAG).tgz \
 		          $(HARBORPKG)/common/templates $(HARBORPKG)/prepare \
 				  $(HARBORPKG)/LICENSE $(HARBORPKG)/NOTICE \
 				  $(HARBORPKG)/install.sh $(HARBORPKG)/$(DOCKERCOMPOSEFILENAME) \
@@ -243,7 +236,7 @@ ifeq ($(MIGRATORFLAG), true)
 endif
 
 version:
-	@printf $(GITTAGVERSION) > $(VERSIONFILEPATH)/$(VERSIONFILENAME);
+	@printf $(VERSIONTAG) > $(VERSIONFILEPATH)/$(VERSIONFILENAME);
 
 check_environment:
 	@$(MAKEPATH)/$(CHECKENVCMD)
@@ -444,10 +437,10 @@ cleanversiontag:
 cleanpackage:
 	@echo "cleaning harbor install package"
 	@if [ -d $(BUILDPATH)/harbor ] ; then rm -rf $(BUILDPATH)/harbor ; fi
-	@if [ -f $(BUILDPATH)/harbor-online-installer-$(GITTAGVERSION).tgz ] ; \
-	then rm $(BUILDPATH)/harbor-online-installer-$(GITTAGVERSION).tgz ; fi
-	@if [ -f $(BUILDPATH)/harbor-offline-installer-$(GITTAGVERSION).tgz ] ; \
-	then rm $(BUILDPATH)/harbor-offline-installer-$(GITTAGVERSION).tgz ; fi
+	@if [ -f $(BUILDPATH)/harbor-online-installer-$(VERSIONTAG).tgz ] ; \
+	then rm $(BUILDPATH)/harbor-online-installer-$(VERSIONTAG).tgz ; fi
+	@if [ -f $(BUILDPATH)/harbor-offline-installer-$(VERSIONTAG).tgz ] ; \
+	then rm $(BUILDPATH)/harbor-offline-installer-$(VERSIONTAG).tgz ; fi
 
 .PHONY: cleanall
 cleanall: cleanbinary cleanimage cleandockercomposefile cleanversiontag cleanpackage
diff --git a/tests/integration.sh b/tests/integration.sh
index c01a9ba15..4574b6b21 100755
--- a/tests/integration.sh
+++ b/tests/integration.sh
@@ -27,6 +27,14 @@ export DRONE_SERVER=$DRONE_SERVER
 export DRONE_TOKEN=$DRONE_TOKEN
 buildinfo=$(drone build info vmware/harbor $DRONE_BUILD_NUMBER)
 echo $buildinfo
+git_commit=$(git rev-parse --short=8 HEAD)
+if [ $DRONE_BUILD_EVENT == "tag" ]; then
+    build_number=$(git describe --abbrev=0 --tags)
+else
+    build_number=$DRONE_BUILD_NUMBER-$git_commit
+fi
+echo build_number
+export HARBOR_BUILD_NUMBER=$build_number
 upload_build=false
 nightly_run=false
 upload_latest_build=false
diff --git a/tests/resources/Harbor-Util.robot b/tests/resources/Harbor-Util.robot
index a586dcb54..e7dad7ab3 100644
--- a/tests/resources/Harbor-Util.robot
+++ b/tests/resources/Harbor-Util.robot
@@ -57,7 +57,7 @@ Package Harbor Offline
     [Arguments]  ${golang_image}=golang:${GOLANG_VERSION}  ${clarity_image}=vmware/harbor-clarity-ui-builder:${CLAIR_BUILDER}  ${with_notary}=true  ${with_clair}=true  ${with_migrator}=true
     Log To Console  \nStart Docker Daemon
     Start Docker Daemon Locally
-    ${rc}  ${output}=  Run And Return Rc And Output  make package_offline DEVFLAG=false GOBUILDIMAGE=${golang_image} COMPILETAG=compile_golangimage CLARITYIMAGE=${clarity_image} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} HTTPPROXY=
+    ${rc}  ${output}=  Run And Return Rc And Output  make package_offline VERSIONTAG=%{HARBOR_BUILD_NUMBER} GOBUILDIMAGE=${golang_image} COMPILETAG=compile_golangimage CLARITYIMAGE=${clarity_image} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} HTTPPROXY=
     Log  ${rc}
     Log  ${output}
     Should Be Equal As Integers  ${rc}  0
@@ -66,7 +66,7 @@ Package Harbor Online
     [Arguments]  ${golang_image}=golang:${GOLANG_VERSION}  ${clarity_image}=vmware/harbor-clarity-ui-builder:${CLAIR_BUILDER}  ${with_notary}=true  ${with_clair}=true  ${with_migrator}=true
     Log To Console  \nStart Docker Daemon
     Start Docker Daemon Locally
-    ${rc}  ${output}=  Run And Return Rc And Output  make package_online DEVFLAG=false GOBUILDIMAGE=${golang_image} COMPILETAG=compile_golangimage CLARITYIMAGE=${clarity_image} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} HTTPPROXY=
+    ${rc}  ${output}=  Run And Return Rc And Output  make package_online VERSIONTAG=%{HARBOR_BUILD_NUMBER} GOBUILDIMAGE=${golang_image} COMPILETAG=compile_golangimage CLARITYIMAGE=${clarity_image} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} HTTPPROXY=
     Log  ${rc}
     Log  ${output}
     Should Be Equal As Integers  ${rc}  0