[zorg] r366310 - monorepo_build.py: Update artifact name

[Azharuddin Mohammed via llvm-commits]

Author: azhar
Date: Wed Jul 17 03:17:01 2019
New Revision: 366310

URL: http://llvm.org/viewvc/llvm-project?rev=366310&view=rev
Log:
monorepo_build.py: Update artifact name

Incorporate the git sha and a sequentially increasing number (which can be
generated using "git describe" and an annotated tag).

Modified:
    zorg/trunk/zorg/jenkins/monorepo_build.py

Modified: zorg/trunk/zorg/jenkins/monorepo_build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/monorepo_build.py?rev=366310&r1=366309&r2=366310&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/monorepo_build.py (original)
+++ zorg/trunk/zorg/jenkins/monorepo_build.py Wed Jul 17 03:17:01 2019
@@ -77,6 +77,7 @@ class Configuration(object):
         self.build_id = os.environ.get('BUILD_ID', 'NONE')
         self.build_number = os.environ.get('BUILD_NUMBER', 'NONE')
         self.git_sha = os.environ.get('GIT_SHA', 'NONE')
+        self.git_distance = os.environ.get('GIT_DISTANCE', 'NONE')
         self.nobootstrap = True
         self.device = None
         self.node_name = os.environ.get('NODE_NAME', None)
@@ -642,9 +643,10 @@ def build_upload_artifact():
     header("Uploading Artifact")
     prop_file = "last_good_build.properties"
 
-    # TODO : azhar : Update artifact name
-    artifact_name = "clang-t{}-b{}.tar.gz".format(conf.build_id,
-                                                  conf.build_number)
+    artifact_name = "clang-d{}-g{}-t{}-b{}.tar.gz".format(conf.git_distance,
+                                                          conf.git_sha,
+                                                          conf.build_id,
+                                                          conf.build_number)
     new_url = conf.job_name + "/" + artifact_name
 
     with open(prop_file, 'w') as prop_fd: