From 695894052c8f1d99314970aff4aba0865728775f Mon Sep 17 00:00:00 2001
From: Lu Qiuwen <luqiuwen@gmail.com>
Date: Thu, 3 Jun 2021 15:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=88=86=E6=94=AF=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=86=B3=E5=AE=9A=E6=98=AF=E5=90=A6=E6=8C=89=E6=AF=8F?=
 =?UTF-8?q?=E6=97=A5=E6=9E=84=E5=BB=BA=E7=89=88=E6=9C=AC=E5=8F=B7=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 14 +++++++++++++-
 Makefile       | 11 ++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54ee860e..916ab794 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ variables:
 .build_tsg-buildimage:
   script:
     - yum -y install ansible pbzip2
-    - make
+    - make DALIY_BUILD_VERSION=$DALIY_BUILD_VERSION
     - chmod +x ./tools/upload.sh
     - ./tools/upload.sh 
   tags:
@@ -17,15 +17,23 @@ feature_branch_build_7400_mcn0:
   variables:
     PROFILE_LIST: 7400MCN0P01R01
     UPLOAD_TO_FILE_REPO: 0
+    DALIY_BUILD_VERSION: 1
   except:
     - tags
+    - /^dev-.*$/i
+    - /^rel-.*$/i
+    - tags
 
 feature_branch_build_7400_mcn123:
   stage: build
   extends: .build_tsg-buildimage
   variables:
     PROFILE_LIST: 7400MCN123P01R01
+    DALIY_BUILD_VERSION: 1
+    DALIY_BUILD_VERSION: 1
+    DALIY_BUILD_VERSION: 1
     UPLOAD_TO_FILE_REPO: 0
+    DALIY_BUILD_VERSION: 1
   except:
     - tags
     - /^dev-.*$/i
@@ -39,6 +47,7 @@ develop_build_9000:
     UPLOAD_TO_FILE_REPO: 1
     PULP3_FILE_REPO_NAME: tsg-os-images-develop
     PULP3_FILE_DIST_NAME: tsg-os-images-develop
+    DALIY_BUILD_VERSION: 1
   only:
     - /^dev-.*$/i
 
@@ -50,6 +59,7 @@ testing_build_9000:
     UPLOAD_TO_FILE_REPO: 1
     PULP3_FILE_REPO_NAME: tsg-os-images-testing
     PULP3_FILE_DIST_NAME: tsg-os-images-testing
+    DALIY_BUILD_VERSION: 1
   only:
     - /^rel-.*$/i
 
@@ -59,6 +69,7 @@ rc_build_9000:
   variables:
     PROFILE_LIST: 9000NPBP01R01
     UPLOAD_TO_FILE_REPO: 1
+    DALIY_BUILD_VERSION: 0
     PULP3_FILE_REPO_NAME: tsg-os-images-rc
     PULP3_FILE_DIST_NAME: tsg-os-images-rc
   only:
@@ -92,6 +103,7 @@ release_build_9000:
   variables:
     PROFILE_LIST: 9000NPBP01R01
     UPLOAD_TO_FILE_REPO: 1
+    DALIY_BUILD_VERSION: 0
     PULP3_FILE_REPO_NAME: tsg-os-images-stable
     PULP3_FILE_DIST_NAME: tsg-os-images-stable
   only:
diff --git a/Makefile b/Makefile
index f982abb0..61c9962b 100644
--- a/Makefile
+++ b/Makefile
@@ -46,15 +46,16 @@ OS_BUILD_TIME := $(subst Z,$e,$(OS_BUILD_TIME))
 OS_BUILD_TIME := $(subst ",$e,$(OS_BUILD_TIME))
 OS_BUILD_TIME := $(subst +,$e,$(OS_BUILD_TIME))
 
-OS_BUILD_HASH := $(subst ",$e,$(VCS_SHORT_HASH))
-OS_BUILD_TAG  := $(subst ",$e,$(VCS_TAG))
+OS_BUILD_HASH    := $(subst ",$e,$(VCS_SHORT_HASH))
+OS_BUILD_TAG     := $(subst ",$e,$(VCS_TAG))
+OS_BUILD_BRANCH  := $(subst -,_,$(VCS_BRANCH))
 
 ifeq ($(OS_BUILD_TAG),)
 OS_BUILD_TAG := $(OS_BUILD_TIME)
 endif
 
-ifdef DALIY_BUILD_VERSION
-OS_RELEASE_VER = 0.0.0-$(OS_BUILD_TIME)-$(OS_BUILD_HASH)
+ifeq ($(DALIY_BUILD_VERSION),1)
+OS_RELEASE_VER = $(OS_BUILD_BRANCH)-$(OS_BUILD_TIME)-$(OS_BUILD_HASH)
 else
 OS_RELEASE_VER = $(OS_BUILD_TAG)-$(OS_BUILD_HASH)
 endif
@@ -78,4 +79,4 @@ all: $(PROFILE_LIST)
 	$(Q) $(MAKE) -f make/Makefile.$< all
 
 clean: $(PROFILE_LIST)
-	$(Q) echo "=== Finished making $@ for $(PLATFORM) ==="
\ No newline at end of file
+	$(Q) echo "=== Finished making $@ for $(PLATFORM) ==="