Skip to contentSkip to conversation

bin/release_scripts/release.py: fix milestone staging

PATCH New Graydon, Tracy 1 participant 1 message Feb 26, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bin/release_scripts/release.py: fix milestone staging

From: Tracy Graydon <[email protected]>

Milestones were going into the top level of the download release directory instead of the milestones subdirectory. Added a check for milestone releases and now adjusts the path accordingly. Also fixed an indent issue which was causing the master md5sum table to be generated for milestones.

---
 bin/release_scripts/release.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
bin/release_scripts/release.py +12 -7
index 4c71e31..158c44a 100755
@@ -453,7 +453,6 @@ if __name__ == '__main__':
 
     PLUGIN_DIR = os.path.join(DL_BASE, "eclipse-plugin", REL_ID)
     RELEASE_DIR = os.path.join(AB_BASE, RELEASE)
-    DL_DIR = os.path.join(DL_BASE, RELEASE)
     MACHINES = os.path.join(RELEASE_DIR, "machines")
     BSP_DIR = os.path.join(RELEASE_DIR, 'bsptarballs')
     TARBALL_DIR = os.path.join(RELEASE_DIR, "tarballs")
@@ -494,18 +493,24 @@ if __name__ == '__main__':
         print "Generating the BSP tarballs."
         make_bsps(BSP_LIST, BSP_DIR)
 
-    # 7) Generate the master md5sum file for the release (for all releases)
-    print "Generating the master md5sum table."
-    gen_rel_md5(RELEASE_DIR, REL_MD5_FILE)
+        # 7) Generate the master md5sum file for the release (for all releases)
+        print "Generating the master md5sum table."
+        gen_rel_md5(RELEASE_DIR, REL_MD5_FILE)
     
     # 8) sync to downloads
+    if REL_TYPE == "milestone":
+        DL_DIR = os.path.join(DL_BASE, "milestones", RELEASE)
+        print "DL_DIR for milestones: %s" %DL_DIR
+    else:
+        DL_DIR = os.path.join(DL_BASE, RELEASE)
+        print "DL_DIR for point/major: %s" %DL_DIR
     print "Publishing release to downloads."
     sync_it(RELEASE_DIR, DL_DIR, "")
 
-    # 9) Publish the ADT repo. The default is NOT to publish the ADT. The ADT 
-    # is deprecated as of 2.1_M1. However, we need to retain backward 
+    # 9) Publish the ADT repo. The default is NOT to publish the ADT. The ADT
+    # is deprecated as of 2.1_M1. However, we need to retain backward
     # compatability for point releases, etc. We do this step after all the other
-    #  stuff because we want the symlinks to have been converted, extraneous 
+    #  stuff because we want the symlinks to have been converted, extraneous
     # files deleted, and md5sums generated.
     #
     if options.pub_adt:
Signature · 1 line
2.4.3