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

schedulers/builders: Clean up deploy_artefacts/send_email/is_release into true boolean types

Browse Source 
Lets use the proper BooleanParameter input type and boolean values for these.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-06-10 23:14:23 +01:00
parent cf536a0a43
commit 223720737f
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builders.py
View File

@ -31,8 +31,8 @@ def get_publish_internal(props, basename=False):
as a property for use by other workers. as a property for use by other workers.
""" """
dest = "" dest = ""
deploy = props.getProperty("deploy_artifacts", "False") deploy = props.getProperty("deploy_artefacts", False)
if props.getProperty("deploy_artifacts", "False") != "False": if deploy:
rel_name = "" rel_name = ""
dest = props.getProperty("publish_destination", "") dest = props.getProperty("publish_destination", "")
if dest: if dest:
@ -40,7 +40,7 @@ def get_publish_internal(props, basename=False):
return os.path.basename(dest) return os.path.basename(dest)
return dest return dest
if props.getProperty("is_release", "False") == "True": if props.getProperty("is_release", False):
milestone = props.getProperty("milestone_number", "") milestone = props.getProperty("milestone_number", "")
rc_number = props.getProperty("rc_number", "") rc_number = props.getProperty("rc_number", "")
snapshot = "" snapshot = ""
@ -109,9 +109,9 @@ def ensure_props_set(props):
""" """
return { return {
"sharedrepolocation": props.getProperty("sharedrepolocation", "None"), "sharedrepolocation": props.getProperty("sharedrepolocation", "None"),
"is_release": props.getProperty("is_release", "None"), "is_release": props.getProperty("is_release", False),
"buildappsrcrev": props.getProperty("buildappsrcrev", "None"), "buildappsrcrev": props.getProperty("buildappsrcrev", "None"),
"deploy_artifacts": props.getProperty("deploy_artifacts", "False"), "deploy_artefacts": props.getProperty("deploy_artefacts", False),
"publish_destination": props.getProperty("publish_destination", "None") "publish_destination": props.getProperty("publish_destination", "None")
} }
@ -241,7 +241,7 @@ def get_props_set():
"sharedrepolocation": util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)), "sharedrepolocation": util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)),
"is_release": util.Property("is_release"), "is_release": util.Property("is_release"),
"buildappsrcrev": "None", "buildappsrcrev": "None",
"deploy_artifacts": util.Property("deploy_artifacts"), "deploy_artefacts": util.Property("deploy_artefacts"),
"publish_destination": util.Property("publish_destination"), "publish_destination": util.Property("publish_destination"),
} }

24
schedulers.py
View File

@ -60,11 +60,10 @@ def props_for_builder(builder):
default="None", default="None",
)) ))
if builder in ['build-appliance', 'buildtools']: if builder in ['build-appliance', 'buildtools']:
props.append(util.ChoiceStringParameter( props.append(util.BooleanParameter(
name="deploy_artifacts", name="deploy_artifacts",
label="Do we want to deploy artifacts? ", label="Do we want to deploy artifacts? ",
choices=["False", "True"], default=Boolean
default="False"
)) ))
props = props + repos_for_builder(builder) props = props + repos_for_builder(builder)
@ -99,11 +98,10 @@ schedulers.append(sched.ForceScheduler(
any expectations for the build's outcome:""", any expectations for the build's outcome:""",
required=False), required=False),
properties=[ properties=[
util.ChoiceStringParameter( util.BooleanParameter(
name="is_release", name="is_release",
label="Generate a release?", label="Generate a release?",
choices=["False", "True"], default=False),
default="False"),
util.StringParameter( util.StringParameter(
name="yocto_number", # used to form publish path name="yocto_number", # used to form publish path
label="Yocto Project Release Number (1.5, 1.6 etc.)"), label="Yocto Project Release Number (1.5, 1.6 etc.)"),
@ -119,16 +117,14 @@ schedulers.append(sched.ForceScheduler(
choices=["", "rc1", "rc2", "rc3", "rc4", "rc5", "rc6", "rc7", choices=["", "rc1", "rc2", "rc3", "rc4", "rc5", "rc6", "rc7",
"rc8", "rc9"], "rc8", "rc9"],
default=""), default=""),
util.ChoiceStringParameter( util.BooleanParameter(
name="send_email", name="send_email",
label="Send QA alert emails?", label="Send QA alert emails?",
choices=["False", "True"], default=False),
default="False"), util.BooleanParameter(
util.ChoiceStringParameter( name="deploy_artefacts",
name="deploy_artifacts", label="Do we want to save build output? ",
label="Do we want to deploy artifacts? ", default=False),
choices=["False", "True"],
default="False"),
ReleaseSelector( ReleaseSelector(
name="branch", name="branch",
label="Release Shortcut Selector", label="Release Shortcut Selector",