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

builders: fix get_publish_dest()

Browse Source 
Various errors resulted from not having been able to test the initial
implmentation of get_publish_dest():
* incorrect logic to determine whether a build was a release
* passing a filename rather than a string representing file contents to
  json.loads()
* missing parameter on a call to buildbot's IProperties.setProperty()

Further we update the properties passed to the triggered builds via the
Trigger build steps to include the deploy_artefacts and publish_destination
properties.

This patch is able to succesfully supply required information for the
helper scripts to publish artefacts.

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
This commit is contained in:
Joshua Lock 2018-03-07 14:37:48 +00:00
parent f2b41bd937
commit d978426cd8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builders.py
View File

@ -38,7 +38,7 @@ def get_publish_dest(props):
if dest:
return dest
if props.getProperty("is_release", "None") != "None":
if props.getProperty("is_release", "False") == "True":
milestone = props.getProperty("milestone_number", "")
rc_number = props.getProperty("rc_number", "")
snapshot = ""
@ -66,7 +66,8 @@ def get_publish_dest(props):
"..")
persist = os.path.join(basedir, "pub_locations.json")
if os.path.exists(persist):
useddests = json.loads(persist)
with open(persist) as f:
useddests = json.load(f)
rev = useddests.get(dest_base, "")
if rev: # incremenent and use
@ -82,7 +83,8 @@ def get_publish_dest(props):
# set the destination as a property to be inherited by workers, so that
# all workers in a triggered set publish to the same location
props.setProperty("publish_destination", dest)
props.setProperty("publish_destination", dest,
"get_publish_dest")
return dest
else:
return "None"
@ -209,7 +211,9 @@ def get_props_set():
set_props = {
"sharedrepolocation": util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)),
"is_release": util.Property("is_release"),
"buildappsrcrev": "None"
"buildappsrcrev": "None",
"deploy_artifacts": util.Property("deploy_artifacts"),
"publish_destination": util.Property("publish_destination")
}
for repo in config.repos: