From 5efbe5d0931462b3b4e66ebd6dd0ee83033e31f3 Mon Sep 17 00:00:00 2001 From: coolprop Date: Sat, 6 Dec 2014 09:57:35 -0800 Subject: [PATCH 1/2] Fixed typo in master.cfg --- dev/buildbot/master/master.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index a24723ec..cca9f2f7 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -1097,7 +1097,7 @@ c['schedulers'].append(ForceScheduler( name="release_scheduler", builderNames=['release version'], properties=[ - StringParameter(name="version", label="Version number", default="0.0.0")], + StringParameter(name="version", label="Version number", default="0.0.0"), BooleanParameter(name="dryrun", label="Do a dry-run of release", default=True)] )) c['schedulers'].append(ForceScheduler( From 69f24cd4e1461e380a48d4bd71204140a586b837 Mon Sep 17 00:00:00 2001 From: coolprop Date: Sat, 6 Dec 2014 10:16:14 -0800 Subject: [PATCH 2/2] Updated buildbot for release script, ready to go --- dev/buildbot/master/master.cfg | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index cca9f2f7..fdc5189e 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -50,6 +50,7 @@ c['change_source'].append(GitPoller( from buildbot.process.factory import BuildFactory from buildbot.steps.source.git import Git from buildbot.steps.shell import ShellCommand +from buildbot.steps.master import MasterShellCommand from buildbot.steps.slave import MakeDirectory, RemoveDirectory, CopyDirectory from buildbot.steps.transfer import DirectoryUpload, FileDownload from buildbot.process import properties @@ -1059,18 +1060,23 @@ for platform in ['windows', 'linux', 'OSX']: @properties.renderer def releaseCommand(props): if props.getProperty('dryrun', default = False): - release = 'release' - else: release = 'dryrun' + else: + release = 'release' version = props.getProperty('version') - return ' '.join(['${HOME}/buildbot/CoolProp.git/dev/scripts/release.sh',version, release]) + return ' '.join(['${HOME}/buildbot/CoolProp.git/dev/scripts/release.bsh',version, release]) +def release_builder(): + f = BuildFactory() + f.addStep(MasterShellCommand(command = releaseCommand)) + return f + c['builders'].append( BuilderConfig(name="release version", - slavenames=["windows-slave"], # Slave is not used, all commands run on master - factory = MasterShellCommand(command = releaseCommand) + slavenames=["OSX-slave"], # Slave is not used, all commands run on master + factory = release_builder() ) )