| 1 |
commit: 1f2f01cb4febebe5d47b4ef6c9591b73cbdfc5a5 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 7 00:46:53 2021 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 7 00:46:53 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=1f2f01cb |
| 7 |
|
| 8 |
Support more options in project dict in config file |
| 9 |
|
| 10 |
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> |
| 11 |
|
| 12 |
buildbot_gentoo_ci/steps/logs.py | 2 +- |
| 13 |
buildbot_gentoo_ci/steps/portage.py | 2 +- |
| 14 |
buildbot_gentoo_ci/steps/update_db.py | 2 +- |
| 15 |
3 files changed, 3 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/buildbot_gentoo_ci/steps/logs.py b/buildbot_gentoo_ci/steps/logs.py |
| 18 |
index d69c447..d86e208 100644 |
| 19 |
--- a/buildbot_gentoo_ci/steps/logs.py |
| 20 |
+++ b/buildbot_gentoo_ci/steps/logs.py |
| 21 |
@@ -37,7 +37,7 @@ class SetupPropertys(BuildStep): |
| 22 |
def run(self): |
| 23 |
self.gentooci = self.master.namedServices['services'].namedServices['gentooci'] |
| 24 |
project_data = yield self.gentooci.db.projects.getProjectByUuid(self.getProperty('project_build_data')['project_uuid']) |
| 25 |
- default_project_data = yield self.gentooci.db.projects.getProjectByName(self.gentooci.config.project['project']) |
| 26 |
+ default_project_data = yield self.gentooci.db.projects.getProjectByName(self.gentooci.config.project['project']['update_db']) |
| 27 |
version_data = yield self.gentooci.db.versions.getVersionByUuid(self.getProperty('project_build_data')['version_uuid']) |
| 28 |
self.setProperty("project_data", project_data, 'project_data') |
| 29 |
self.setProperty("default_project_data", default_project_data, 'default_project_data') |
| 30 |
|
| 31 |
diff --git a/buildbot_gentoo_ci/steps/portage.py b/buildbot_gentoo_ci/steps/portage.py |
| 32 |
index 37f7342..0a131d7 100644 |
| 33 |
--- a/buildbot_gentoo_ci/steps/portage.py |
| 34 |
+++ b/buildbot_gentoo_ci/steps/portage.py |
| 35 |
@@ -326,7 +326,7 @@ class SetEnvDefault(BuildStep): |
| 36 |
def run(self): |
| 37 |
self.gentooci = self.master.namedServices['services'].namedServices['gentooci'] |
| 38 |
project_data = self.getProperty('project_data') |
| 39 |
- default_project_data = yield self.gentooci.db.projects.getProjectByName(self.gentooci.config.project['project']) |
| 40 |
+ default_project_data = yield self.gentooci.db.projects.getProjectByName(self.gentooci.config.project['project']['update_db']) |
| 41 |
aftersteps_list = [] |
| 42 |
separator1 = '\n' |
| 43 |
separator2 = ' ' |
| 44 |
|
| 45 |
diff --git a/buildbot_gentoo_ci/steps/update_db.py b/buildbot_gentoo_ci/steps/update_db.py |
| 46 |
index 8e7f8ee..0ed4be1 100644 |
| 47 |
--- a/buildbot_gentoo_ci/steps/update_db.py |
| 48 |
+++ b/buildbot_gentoo_ci/steps/update_db.py |
| 49 |
@@ -19,7 +19,7 @@ class GetDataGentooCiProject(BuildStep): |
| 50 |
@defer.inlineCallbacks |
| 51 |
def run(self): |
| 52 |
self.gentooci = self.master.namedServices['services'].namedServices['gentooci'] |
| 53 |
- self.project_data = yield self.gentooci.db.projects.getProjectByName(self.gentooci.config.project['project']) |
| 54 |
+ self.project_data = yield self.gentooci.db.projects.getProjectByName(self.gentooci.config.project['project']['update_db']) |
| 55 |
if self.project_data is None: |
| 56 |
log.err('No data for project in the database') |
| 57 |
return FAILURE |
Archives