diff --git a/BuildBotLib/basemodule.py b/BuildBotLib/basemodule.py index 7d5a155..915b19c 100644 --- a/BuildBotLib/basemodule.py +++ b/BuildBotLib/basemodule.py @@ -101,3 +101,6 @@ class BaseModule: else: command.extend(['-j', '1']) return command + + def defaultLocationOfQIFRepository(self): + return "/var/www/repo/" diff --git a/BuildBotLib/make.py b/BuildBotLib/make.py index f6e68c4..82441a1 100644 --- a/BuildBotLib/make.py +++ b/BuildBotLib/make.py @@ -240,13 +240,18 @@ class Make(BaseModule): repo = str(props.getProperty('repository')) return self.getNameProjectFromGitUrl(repo) + @util.renderer + def repoLocation(props): + return self.defaultLocationOfQIFRepository() + res += [steps.Trigger(schedulerNames=['repogen'], doStepIf=lambda step: self.isRelease(step) and self.isSupport(step), set_properties={"tempPackage": tempDirProp, "platform": platform, - "projectName": projectName} + "projectName": projectName, + "repoLocation": repoLocation} )] return res diff --git a/BuildBotLib/qifRepogen.py b/BuildBotLib/qifRepogen.py index 0ee257d..429115d 100644 --- a/BuildBotLib/qifRepogen.py +++ b/BuildBotLib/qifRepogen.py @@ -107,6 +107,6 @@ class QIFRepogen (BaseModule): util.StringParameter( name='repoLocation', label='repository location', - default="/var/www/repo/" + default=defaultLocationOfQIFRepository() ), ]