From a2f90e1e06ca201300fbd0c0314f9ffd013b015a Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sun, 10 Jan 2021 12:12:26 +0300
Subject: [PATCH] fixed location of the qif repository
---
BuildBotLib/basemodule.py | 3 +++
BuildBotLib/make.py | 7 ++++++-
BuildBotLib/qifRepogen.py | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
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()
),
]