diff --git a/builders.py b/builders.py index 5c8d978..0656e8b 100644 --- a/builders.py +++ b/builders.py @@ -31,8 +31,8 @@ def get_publish_internal(props, basename=False): as a property for use by other workers. """ dest = "" - deploy = props.getProperty("deploy_artifacts", "False") - if props.getProperty("deploy_artifacts", "False") != "False": + deploy = props.getProperty("deploy_artefacts", False) + if deploy: rel_name = "" dest = props.getProperty("publish_destination", "") if dest: @@ -40,7 +40,7 @@ def get_publish_internal(props, basename=False): return os.path.basename(dest) return dest - if props.getProperty("is_release", "False") == "True": + if props.getProperty("is_release", False): milestone = props.getProperty("milestone_number", "") rc_number = props.getProperty("rc_number", "") snapshot = "" @@ -109,9 +109,9 @@ def ensure_props_set(props): """ return { "sharedrepolocation": props.getProperty("sharedrepolocation", "None"), - "is_release": props.getProperty("is_release", "None"), + "is_release": props.getProperty("is_release", False), "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") } @@ -241,7 +241,7 @@ def get_props_set(): "sharedrepolocation": util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)), "is_release": util.Property("is_release"), "buildappsrcrev": "None", - "deploy_artifacts": util.Property("deploy_artifacts"), + "deploy_artefacts": util.Property("deploy_artefacts"), "publish_destination": util.Property("publish_destination"), } diff --git a/schedulers.py b/schedulers.py index eeb788c..8f3dbc5 100644 --- a/schedulers.py +++ b/schedulers.py @@ -60,11 +60,10 @@ def props_for_builder(builder): default="None", )) if builder in ['build-appliance', 'buildtools']: - props.append(util.ChoiceStringParameter( + props.append(util.BooleanParameter( name="deploy_artifacts", label="Do we want to deploy artifacts? ", - choices=["False", "True"], - default="False" + default=Boolean )) props = props + repos_for_builder(builder) @@ -99,11 +98,10 @@ schedulers.append(sched.ForceScheduler( any expectations for the build's outcome:""", required=False), properties=[ - util.ChoiceStringParameter( + util.BooleanParameter( name="is_release", label="Generate a release?", - choices=["False", "True"], - default="False"), + default=False), util.StringParameter( name="yocto_number", # used to form publish path 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", "rc8", "rc9"], default=""), - util.ChoiceStringParameter( + util.BooleanParameter( name="send_email", label="Send QA alert emails?", - choices=["False", "True"], - default="False"), - util.ChoiceStringParameter( - name="deploy_artifacts", - label="Do we want to deploy artifacts? ", - choices=["False", "True"], - default="False"), + default=False), + util.BooleanParameter( + name="deploy_artefacts", + label="Do we want to save build output? ", + default=False), ReleaseSelector( name="branch", label="Release Shortcut Selector",