Skip to contentSkip to conversation

bin/release_scripts/release.py

PATCH New Graydon, Tracy 1 participant 2 messages May 4, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 bin/release_scripts/release.py

Fixed the path for the publishing of the eclipse plugins. They were going to the wrong subdirectory under downloads.

---
 bin/release_scripts/release.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
bin/release_scripts/release.py +3 -2
index be67f9d..cae6fe7 100755
@@ -351,7 +351,8 @@ if __name__ == '__main__':
    
     VHOSTS = "/srv/www/vhosts"
     AB_BASE = os.path.join(VHOSTS, "autobuilder.yoctoproject.org/pub/releases")
-    DL_BASE = os.path.join(VHOSTS, "downloads.yoctoproject.org/releases/yocto")
+    DL_DIR = os.path.join(VHOSTS, "downloads.yoctoproject.org/releases")
+    DL_BASE = os.path.join(DL_DIR, "/releases/yocto")
     ADT_BASE = os.path.join(VHOSTS, "adtrepo.yoctoproject.org")
 
     # List of the directories we delete from all releases
@@ -442,7 +443,7 @@ if __name__ == '__main__':
         print "MILESTONE: %s" %MILESTONE
     print
 
-    PLUGIN_DIR = os.path.join(DL_BASE, "eclipse-plugin", REL_ID)
+    PLUGIN_DIR = os.path.join(DL_DIR, "eclipse-plugin", REL_ID)
     RELEASE_DIR = os.path.join(AB_BASE, RELEASE)
     MACHINES = os.path.join(RELEASE_DIR, "machines")
     BSP_DIR = os.path.join(RELEASE_DIR, 'bsptarballs')
Signature · 1 line
2.7.0
#1 lore raw

PATCH 2/2 bin/release_scripts/release.py

Remove the step for syncing the staged release to downloads directory. We pretty much NEVER do the sync to downloads at the time we do staging. Sync happens much later, as a separate process. We don't need this in the release script.

---
 bin/release_scripts/release.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
bin/release_scripts/release.py +1 -11
index cae6fe7..cfd65cd 100755
@@ -489,17 +489,7 @@ if __name__ == '__main__':
         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
+    # 8) 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
Signature · 1 line
2.7.0