MIRRORS/yocto-autobuilder2
1
0
Fork 0
mirror of git://git.yoctoproject.org/yocto-autobuilder2.git synced 2025-07-19 20:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

builders: Fix basename version of get_publish_dest

Browse Source 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-05-15 15:53:05 +01:00
parent 7e6b5d4119
commit a1596a5f29
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builders.py
View File

@ -25,8 +25,7 @@ def get_sstate_release_number(props):
return '.'.join(release_components).strip('.') return '.'.join(release_components).strip('.')
@util.renderer def get_publish_internal(props, basename=False):
def get_publish_dest(props):
""" """
Calculate the location to which artefacts should be published and store it Calculate the location to which artefacts should be published and store it
as a property for use by other workers. as a property for use by other workers.
@ -37,6 +36,8 @@ def get_publish_dest(props):
rel_name = "" rel_name = ""
dest = props.getProperty("publish_destination", "") dest = props.getProperty("publish_destination", "")
if dest: if dest:
if basename:
return os.path.basename(dest)
return dest return dest
if props.getProperty("is_release", "False") == "True": if props.getProperty("is_release", "False") == "True":
@ -85,10 +86,19 @@ def get_publish_dest(props):
# all workers in a triggered set publish to the same location # all workers in a triggered set publish to the same location
props.setProperty("publish_destination", dest, props.setProperty("publish_destination", dest,
"get_publish_dest") "get_publish_dest")
if basename:
return os.path.basename(dest)
return dest return dest
else: else:
return "None" return "None"
@util.renderer
def get_publish_dest(props):
return get_publish_internal(props, basename=False)
@util.renderer
def get_publish_name(props):
return get_publish_internal(props, basename=True)
@util.renderer @util.renderer
def ensure_props_set(props): def ensure_props_set(props):
@ -252,7 +262,7 @@ factory.addStep(steps.ShellCommand(
util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/send-qa-email"), util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/send-qa-email"),
util.Interpolate("%(prop:builddir)s/layerinfo.json"), util.Interpolate("%(prop:builddir)s/layerinfo.json"),
get_publish_dest, get_publish_dest,
os.path.basename(get_publish_dest), get_publish_name,
], ],
name="Send QA Email")) name="Send QA Email"))