[yocto-autobuilder][PATCH] bin/release_scripts/release.py

[yocto-autobuilder][PATCH] bin/release_scripts/release.py

[Graydon, Tracy]

This is part of the release automation work, related to
Yocto bug #8942. This patch includes:

- Adding a check to see if the rc candidate passed in actually
  exists first.
- Adds the ADT repo publishing step of the release process.
- Removes the print_vars function that was largely for script
  testing purposes and is essentially otherwise useless.
- Removes some variable definitions that were used for testing.

Signed-off-by: Graydon, Tracy <tracy.graydon@intel.com>
---
 bin/release_scripts/release.py | 134 ++++++++++++++++++++++++++---------------
 1 file changed, 85 insertions(+), 49 deletions(-)

diff --git a/bin/release_scripts/release.py b/bin/release_scripts/release.py
index 27ee409..d67a7ec 100755
--- a/bin/release_scripts/release.py
+++ b/bin/release_scripts/release.py
@@ -20,33 +20,6 @@ import shutil
 from shutil import rmtree, copyfile
 from subprocess import call
 
-def print_vars():
-    print "RELEASE: %s" %RELEASE
-    print "REL_TYPE: %s" %REL_TYPE
-    print "RC_DIR: %s" %RC_DIR
-    print "REL_ID: %s" %REL_ID
-    print "RC: %s" %RC
-    if MILESTONE != "":
-        print "Milestone: %s" %MILESTONE
-    if POKY_VER != "":
-        print "POKY_VER: %s" %POKY_VER
-    else:
-       print "POKY_VER: undefined!"
-    if BRANCH:
-        print "BRANCH: %s" %BRANCH
-    else:
-        print "BRANCH: undefined!"
-
-    print "DL_BASE: %s" %DL_BASE
-    if RC_SOURCE != "":
-        print "RC_SOURCE: %s" %RC_SOURCE
-    print "RELEASE_DIR: %s" %RELEASE_DIR
-    print "ECLIPSE_DIR: %s" %ECLIPSE_DIR
-    print "PLUGIN_DIR: %s" %PLUGIN_DIR
-    print "DL_DIR: %s" %DL_DIR
-    print
-    return
-
 def sanity_check(source, target):
     if not os.path.exists(source):
        print
@@ -64,7 +37,6 @@ def sanity_check(source, target):
        sys.exit()
     return
 
-
 def sync_it(source, target, exclude_list):
     print "Syncing %s to %s" %(source, target)
     sanity_check(source, target)
@@ -346,21 +318,48 @@ def gen_rel_md5(dirname, md5_file):
     f.close()
     return
 
+def publish_adt(rel_id, rel_type, opts):
+    if opts:
+        ADT_DIR = os.path.join(ADT_BASE, opts)
+    else:
+        if rel_type == "milestone":
+            chunks = split_thing(rel_id, "_")
+            id_thing = float(chunks[0])
+            id_thing = id_thing - 0.1
+            rel_id = str(id_thing) + "+" + "snapshot"
+        ADT_DIR = os.path.join(ADT_BASE, rel_id)
+    print "ADT_DIR: %s" %ADT_DIR
+    if os.path.exists(ADT_DIR):
+        print "ADT_DIR %s EXISTS! Refusing to clobber!" %ADT_DIR
+        sys.exit()
+    else:
+        ADT_ROOTFS = os.path.join(ADT_DIR, "rootfs")
+        ADT_IPK = os.path.join(ADT_DIR, "adt-ipk")
+        QEMU_DIR = os.path.join(MACHINES, "qemu")
+        IPK_DIR = os.path.join(RELEASE_DIR, "ipk")
+        os.mkdir(ADT_DIR)
+        os.mkdir(ADT_ROOTFS)
+        dirlist = get_list(QEMU_DIR)
+
+        for dirname in dirlist:
+            QEMU_SRC = os.path.join(QEMU_DIR, dirname)
+            QEMU_TARGET = os.path.join(ADT_ROOTFS, dirname)
+            print "QEMU_SRC: %s" %QEMU_SRC
+            sync_it(QEMU_SRC, QEMU_TARGET, "")
+        
+        sync_it(IPK_DIR, ADT_IPK, "")
+    return
 
 if __name__ == '__main__':
     
     os.system("clear")
     print
    
-    # This is for testing convenience
-    #HOME_BASE = "/home/tgraydon/work/release"
-    #AB_BASE = HOME_BASE
-    #DL_BASE = os.path.join(HOME_BASE, "downloads")
-
-    # This is the legit set of vars used for production release
     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")
+    ADT_DEV = os.path.join(VHOSTS, "adtrepo-dev")
+    ADT_BASE = os.path.join(VHOSTS, "adtrepo.yoctoproject.org")
 
     # List of the directories we delete from all releases
     UNLOVED = ['rpm', 'deb', 'ptest', 'adt-installer-QA']
@@ -381,7 +380,10 @@ if __name__ == '__main__':
     parser.add_option("-p", "--poky-ver",
                       type="string", dest="poky",
                       help="Required for Major and Point releases. i.e. 14.0.0")
-                     
+    parser.add_option("-a", "--adt-dir",
+                      type="string", dest="adt",
+                      help="Use when you need to publish the ADT repo to a custom location. i.e. python adtcopy -b yocto-2.0_M1.rc1 -a 1.8+snaphot")
+
     (options, args) = parser.parse_args()
  
     REL_TYPE = ""
@@ -395,19 +397,23 @@ if __name__ == '__main__':
     else:
         BRANCH = ""
 
-
     if options.build:
         # Figure out the release name, type of release, and generate some vars, do some basic validation
-        chunks = split_thing(options.build, ".")
+        options.build = options.build.lower()
+        RC = split_thing(options.build, ".")[-1]
+        chunks = split_thing(options.build, ".") # i.e. split yocto-2.1_m1.rc1
         chunks.pop()
-        RELEASE = rejoin_thing(chunks, ".")
-        rel_thing = split_thing(options.build, "-")
-        RC = split_thing(options.build, ".")[-1].lower()
-        RC_DIR = RELEASE + "." + RC
-        REL_ID = split_thing(RELEASE, "-")[-1]
-        milestone = split_thing(REL_ID, "_")
-        if len(milestone) == 1:
-            thing = split_thing(milestone[0], ".")
+        chunks[1] = chunks[1].upper()
+        RELEASE = rejoin_thing(chunks, ".")  # i.e. yocto-2.1_m1
+        REL_ID = split_thing(RELEASE, "-")[-1].upper()
+        RC_DIR = rejoin_thing([RELEASE, RC], ".")
+        RC_SOURCE = os.path.join(AB_BASE, RC_DIR)
+        if not os.path.exists(RC_SOURCE):
+            print "%s does not appear to be a valid RC dir. Check your args." %RC_SOURCE
+            sys.exit()
+        relstring = split_thing(REL_ID, "_")
+        if len(relstring) == 1:
+            thing = split_thing(relstring[0], ".")
             if len(thing) == 3:
                 REL_TYPE = "point"
             elif len(thing) == 2:
@@ -420,14 +426,27 @@ if __name__ == '__main__':
                 print "Please use -h or --help for options."
                 sys.exit()
         else:
-            MILESTONE = milestone.pop()
+            MILESTONE = relstring.pop()
             REL_TYPE = "milestone"
     else:
         print "Build ID is a required argument."
         print "Please use -h or --help for options."
         sys.exit()
+   
+    if not (RELEASE and RC and REL_ID and REL_TYPE):
+        print "Can't determine the release type. Check your args."
+        print "You gave me: %s" %options.build
+        sys.exit()
     
-    RC_SOURCE = os.path.join(AB_BASE, RC_DIR)
+    print "RC_DIR: %s" %RC_DIR
+    print "RELEASE: %s" %RELEASE
+    print "RC: %s" %RC
+    print "REL_ID: %s" %REL_ID
+    print "REL_TYPE: %s" %REL_TYPE
+    if MILESTONE:
+        print "MILESTONE: %s" %MILESTONE
+    print
+
     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)
@@ -438,38 +457,55 @@ if __name__ == '__main__':
     ECLIPSE_DIR = os.path.join(RELEASE_DIR, "eclipse-plugin")
     BUILD_APP_DIR = os.path.join(RELEASE_DIR, "build-appliance")
     REL_MD5_FILE = RELEASE + ".md5sum"
- 
-    print_vars()
 
     # For all releases:
     # 1) Rsync the rc candidate to a staging dir where all work happens
     sync_it(RC_SOURCE, RELEASE_DIR, UNLOVED)
     
     # 2) Convert the symlinks in build-appliance dir.
+    print "Converting the build-appliance symlink."
     convert_symlinks(BUILD_APP_DIR)
 
     # 3) In machines dir, convert the symlinks, delete the cruft
+    print "Cleaning up the machines dirs, converting symlinks."
     dirlist = get_list(MACHINES)
     for dirname in dirlist:
         dirname = os.path.join(MACHINES, dirname)
         convert_symlinks(dirname)
         nuke_cruft(dirname, CRUFT_LIST)
+    print "Generating fresh md5sums."
     gen_md5sum(MACHINES)
     
     # For major and point releases
     if REL_TYPE == "major" or REL_TYPE == "point":
         # 4) Fix up the eclipse and poky tarballs
+        print "Cleaning up the eclipse, poky and other tarballs."
         fix_tarballs()
 
         # 5) Publish the eclipse stuff
+        print "Publishing the eclipse plugins."
         pub_eclipse(ECLIPSE_DIR, PLUGIN_DIR)
 
         # 6) Make the bsps
+        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)
     
     # 8) sync to downloads
+    print "Publishing release to downloads."
     sync_it(RELEASE_DIR, DL_DIR, "")
 
+    # 9) Publish the ADT repo
+    # We do this after all the other stuff because we want the symlinks
+    # to have been converted, extraneous files deleted, and md5sums generated. This
+    # probably could run as it's own subprocess in parallel to other things to speed things up.
+    # For now, we do this at the end.
+    #
+    print "Publishing the ADT repo."
+    if options.adt:
+        publish_adt(REL_ID, REL_TYPE, options.adt)
+    else:
+        publish_adt(REL_ID, REL_TYPE, "")
-- 
2.4.3

[yocto-autobuilder][PATCH] bin/release_scripts/release.py

[Graydon, Tracy]

This patch removes the BSP creation for the p1022ds and the mpc8315e-rdb
platforms.

Signed-off-by: Graydon, Tracy <tracy.graydon@intel.com>
---
 bin/release_scripts/release.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/bin/release_scripts/release.py b/bin/release_scripts/release.py
index 158c44a..be67f9d 100755
--- a/bin/release_scripts/release.py
+++ b/bin/release_scripts/release.py
@@ -244,18 +244,9 @@ def nuke_cruft(dirname, ext_list):
             qemu_dir = os.path.join(MACHINES, dirname, dir)
             nuke_cruft(qemu_dir, CRUFT_LIST)
     else:
-        foo = dirname.find("p1022")
-        if foo == -1:
-            # NOT P1022ds
-            for ext in ext_list:
-                print "Deleting %s files" %ext
-                os.system("rm -f %s/%s" %(dirname, ext))
-        else:
-            # IS P1022ds
-            for ext in ext_list:
-                if ext != "*.tar.gz":
-                    print "Deleting %s files" %ext
-                    os.system("rm -f %s/%s" %(dirname, ext))
+        for ext in ext_list:
+            print "Deleting %s files" %ext
+            os.system("rm -f %s/%s" %(dirname, ext))
     print
     return
 
@@ -368,7 +359,7 @@ if __name__ == '__main__':
     # List of the files in machines directories that we delete from all releases
     CRUFT_LIST = ['*.md5sum', '*.tar.gz', '*.iso']
     # List of the platforms for which we want to generate BSP tarballs. Major and point releases.
-    BSP_LIST = ['beaglebone', 'edgerouter', 'genericx86', 'genericx86-64', 'mpc8315e-rdb', 'p1022ds']
+    BSP_LIST = ['beaglebone', 'edgerouter', 'genericx86', 'genericx86-64']
     # List of files we do not want to include in the BSP tarballs.
     BSP_JUNK = ['*.manifest', '*.tar.bz2', '*.tgz', '*.iso', '*.md5sum', '*.tar.gz', '*-dev-*', '*-sdk-*']
 
-- 
2.7.0

[yocto-autobuilder][PATCH] bin/release_scripts/release.py

[Graydon, Tracy]

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

Signed-off-by: Graydon, Tracy <tracy.graydon@intel.com>
---
 bin/release_scripts/release.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/bin/release_scripts/release.py b/bin/release_scripts/release.py
index 51cd607..3d4ce39 100755
--- a/bin/release_scripts/release.py
+++ b/bin/release_scripts/release.py
@@ -340,18 +340,18 @@ def publish_adt(rel_id, rel_type, opts):
             QEMU_TARGET = os.path.join(ADT_ROOTFS, dirname)
             print "QEMU_SRC: %s" %QEMU_SRC
             sync_it(QEMU_SRC, QEMU_TARGET, "")
-
         sync_it(IPK_DIR, ADT_IPK, "")
     return
 
 if __name__ == '__main__':
-
+    
     os.system("clear")
     print
-
+   
     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
@@ -380,7 +380,7 @@ if __name__ == '__main__':
                       help="Use when you need to publish the ADT repo to a custom location. i.e. python adtcopy -b yocto-2.0_M1.rc1 -a 1.8+snaphot")
 
     (options, args) = parser.parse_args()
-
+ 
     REL_TYPE = ""
     MILESTONE = ""
     if options.poky:
@@ -427,12 +427,12 @@ if __name__ == '__main__':
         print "Build ID is a required argument."
         print "Please use -h or --help for options."
         sys.exit()
-
+   
     if not (RELEASE and RC and REL_ID and REL_TYPE):
         print "Can't determine the release type. Check your args."
         print "You gave me: %s" %options.build
         sys.exit()
-
+    
     print "RC_DIR: %s" %RC_DIR
     print "RELEASE: %s" %RELEASE
     print "RC: %s" %RC
@@ -442,7 +442,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')
@@ -455,7 +455,7 @@ if __name__ == '__main__':
     # For all releases:
     # 1) Rsync the rc candidate to a staging dir where all work happens
     sync_it(RC_SOURCE, RELEASE_DIR, UNLOVED)
-
+    
     # 2) Convert the symlinks in build-appliance dir.
     print "Converting the build-appliance symlink."
     convert_symlinks(BUILD_APP_DIR)
@@ -469,7 +469,7 @@ if __name__ == '__main__':
         nuke_cruft(dirname, CRUFT_LIST)
     print "Generating fresh md5sums."
     gen_md5sum(MACHINES)
-
+    
     # For major and point releases
     if REL_TYPE == "major" or REL_TYPE == "point":
         # 4) Fix up the eclipse and poky tarballs
@@ -487,7 +487,7 @@ if __name__ == '__main__':
         # 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)
-- 
2.7.0

[yocto-autobuilder][PATCH] bin/release_scripts/release.py

[Graydon, Tracy]

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.

Signed-off-by: Graydon, Tracy <tracy.graydon@intel.com>
---
 bin/release_scripts/release.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/bin/release_scripts/release.py b/bin/release_scripts/release.py
index 3d4ce39..2b4d21c 100755
--- a/bin/release_scripts/release.py
+++ b/bin/release_scripts/release.py
@@ -488,17 +488,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
-- 
2.7.0

Re: [yocto-autobuilder][PATCH] bin/release_scripts/release.py

[Flanagan, Elizabeth]

pulled into master. thanks!

-b

On 24 May 2016 at 03:12, Graydon, Tracy <tracy.graydon@intel.com> wrote:
> 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.
>
> Signed-off-by: Graydon, Tracy <tracy.graydon@intel.com>
> ---
>  bin/release_scripts/release.py | 12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/bin/release_scripts/release.py b/bin/release_scripts/release.py
> index 3d4ce39..2b4d21c 100755
> --- a/bin/release_scripts/release.py
> +++ b/bin/release_scripts/release.py
> @@ -488,17 +488,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
> --
> 2.7.0
>



-- 
Elizabeth Flanagan
Yocto Project
Build and Release

Re: [yocto-autobuilder][PATCH] bin/release_scripts/release.py

[Randle, William C]

On Mon, 2016-05-23 at 19:07 -0700, Graydon, Tracy wrote:
> Fixed the path for the publishing of the eclipse plugins. They were
> going to the wrong subdirectory under downloads.
> 
> Signed-off-by: Graydon, Tracy <tracy.graydon@intel.com>
> ---
>  bin/release_scripts/release.py | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/bin/release_scripts/release.py b/bin/release_scripts/release.py
> index 51cd607..3d4ce39 100755
> --- a/bin/release_scripts/release.py
> +++ b/bin/release_scripts/release.py
> @@ -340,18 +340,18 @@ def publish_adt(rel_id, rel_type, opts):
>              QEMU_TARGET = os.path.join(ADT_ROOTFS, dirname)
>              print "QEMU_SRC: %s" %QEMU_SRC
>              sync_it(QEMU_SRC, QEMU_TARGET, "")
> -
>          sync_it(IPK_DIR, ADT_IPK, "")
>      return
>  
>  if __name__ == '__main__':
> -
> +    
>      os.system("clear")
>      print
> -
> +   
>      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")
>  
So is the intent is to create a new DL_BASE
directory downloads.yoctoproject.org/releases/releases/yocto or should that be:
    DL_BASE = os.path.join(DL_DIR, "/yocto")

    -Bill

Re: [yocto-autobuilder][PATCH] bin/release_scripts/release.py

[Graydon, Tracy]

On 05/24/16, 8:46 AM, "Randle, William C" <william.c.randle@intel.com>
wrote:

>On Mon, 2016-05-23 at 19:07 -0700, Graydon, Tracy wrote:
>> Fixed the path for the publishing of the eclipse plugins. They were
>> going to the wrong subdirectory under downloads.
>> 
>> Signed-off-by: Graydon, Tracy <tracy.graydon@intel.com>
>> ---
>>  bin/release_scripts/release.py | 22 +++++++++++-----------
>>  1 file changed, 11 insertions(+), 11 deletions(-)
>> 
>> diff --git a/bin/release_scripts/release.py
>>b/bin/release_scripts/release.py
>> index 51cd607..3d4ce39 100755
>> --- a/bin/release_scripts/release.py
>> +++ b/bin/release_scripts/release.py
>> @@ -340,18 +340,18 @@ def publish_adt(rel_id, rel_type, opts):
>>              QEMU_TARGET = os.path.join(ADT_ROOTFS, dirname)
>>              print "QEMU_SRC: %s" %QEMU_SRC
>>              sync_it(QEMU_SRC, QEMU_TARGET, "")
>> -
>>          sync_it(IPK_DIR, ADT_IPK, "")
>>      return
>>  
>>  if __name__ == '__main__':
>> -
>> +    
>>      os.system("clear")
>>      print
>> -
>> +   
>>      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")
>>  
>So is the intent is to create a new DL_BASE
>directory downloads.yoctoproject.org/releases/releases/yocto or should
>that be:
>    DL_BASE = os.path.join(DL_DIR, "/yocto")
>
>    -Bill
>

Argh. No, that DL_BASE line shouldn’t be there. It’s cruft. I thought I
had deleted it. Thanks for catching. I will resubmit the patch with that
fix.

-t

[yocto-autobuilder][PATCH] bin/release_scripts/release.py

[Graydon, Tracy]

Get rid of the extraneous DL_BASE line. It's not used and should have
been removed when I fixed the eclipse-plugin release path.

Signed-off-by: Graydon, Tracy <tracy.graydon@intel.com>
---
 bin/release_scripts/release.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/release_scripts/release.py b/bin/release_scripts/release.py
index 2b4d21c..89f68be 100755
--- a/bin/release_scripts/release.py
+++ b/bin/release_scripts/release.py
@@ -351,7 +351,6 @@ if __name__ == '__main__':
     VHOSTS = "/srv/www/vhosts"
     AB_BASE = os.path.join(VHOSTS, "autobuilder.yoctoproject.org/pub/releases")
     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
-- 
2.7.0

Re: [yocto-autobuilder][PATCH] bin/release_scripts/release.py

[Randle, William C]

On Tue, 2016-05-24 at 16:06 -0700, Graydon, Tracy wrote:
> Get rid of the extraneous DL_BASE line. It's not used and should have
> been removed when I fixed the eclipse-plugin release path.
> 
> Signed-off-by: Graydon, Tracy <tracy.graydon@intel.com>
> ---
>  bin/release_scripts/release.py | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/bin/release_scripts/release.py b/bin/release_scripts/release.py
> index 2b4d21c..89f68be 100755
> --- a/bin/release_scripts/release.py
> +++ b/bin/release_scripts/release.py
> @@ -351,7 +351,6 @@ if __name__ == '__main__':
>      VHOSTS = "/srv/www/vhosts"
>      AB_BASE = os.path.join(VHOSTS,
> "autobuilder.yoctoproject.org/pub/releases")
>      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

Since your previous version of this patch has not yet been applied to master, I
would think it would be better to incorporate this as part of a V2 of your
previous patch, rather than a new patch on top of an as yet unapplied patch.

    -Bill

Re: [yocto-autobuilder][PATCH] bin/release_scripts/release.py

[Graydon, Tracy]

On 05/24/16, 4:30 PM, "Randle, William C" <william.c.randle@intel.com>
wrote:

>On Tue, 2016-05-24 at 16:06 -0700, Graydon, Tracy wrote:
>> Get rid of the extraneous DL_BASE line. It's not used and should have
>> been removed when I fixed the eclipse-plugin release path.
>> 
>> Signed-off-by: Graydon, Tracy <tracy.graydon@intel.com>
>> ---
>>  bin/release_scripts/release.py | 1 -
>>  1 file changed, 1 deletion(-)
>> 
>> diff --git a/bin/release_scripts/release.py
>>b/bin/release_scripts/release.py
>> index 2b4d21c..89f68be 100755
>> --- a/bin/release_scripts/release.py
>> +++ b/bin/release_scripts/release.py
>> @@ -351,7 +351,6 @@ if __name__ == '__main__':
>>      VHOSTS = "/srv/www/vhosts"
>>      AB_BASE = os.path.join(VHOSTS,
>> "autobuilder.yoctoproject.org/pub/releases")
>>      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
>
>Since your previous version of this patch has not yet been applied to
>master, I
>would think it would be better to incorporate this as part of a V2 of your
>previous patch, rather than a new patch on top of an as yet unapplied
>patch.

Ah, you are right. I thought it had been pulled in already. I’ll rebase.

>
>    -Bill