commit: 04836c8c78369e1a5acbc460343b003c3a337f20
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 18 23:16:08 2021 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Thu Mar 18 23:16:08 2021 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=04836c8c
Clean up Package and Category code
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>
buildbot_gentoo_ci/config/buildfactorys.py | 8 +++---
buildbot_gentoo_ci/steps/category.py | 25 ++++++++++-------
buildbot_gentoo_ci/steps/package.py | 44 +++++++++++++++++-------------
3 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/buildbot_gentoo_ci/config/buildfactorys.py
b/buildbot_gentoo_ci/config/buildfactorys.py
index f5a3b35..db48130 100644
--- a/buildbot_gentoo_ci/config/buildfactorys.py
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -41,17 +41,17 @@ def update_db_cp():
# else
# add category to db step
# return category_data
- f.addStep(category.CheckCGentooCiProject())
+ f.addStep(category.CheckC())
# if package in db
# return package_data
# add check package path step at end
# else
# add package to db step
# return package_data
- f.addStep(package.CheckPGentooCiProject())
+ f.addStep(package.CheckP())
# Trigger new builders with v from cpv
- # return package_data, cpv, repository_data, project_data, config_root
- f.addStep(package.TriggerCheckVGentooCiProject())
+ # return package_data, cpv, repository_data, project_data
+ f.addStep(package.TriggerCheckForV())
return f
def update_db_v():
diff --git a/buildbot_gentoo_ci/steps/category.py
b/buildbot_gentoo_ci/steps/category.py
index 1aca99a..81061e6 100644
--- a/buildbot_gentoo_ci/steps/category.py
+++ b/buildbot_gentoo_ci/steps/category.py
@@ -18,6 +18,13 @@ class AddCategory(BuildStep):
def __init__(self, **kwargs):
super().__init__(**kwargs)
+ name = 'AddCategory'
+ description = 'Running'
+ descriptionDone = 'Ran'
+ descriptionSuffix = None
+ haltOnFailure = True
+ flunkOnFailure = True
+
@defer.inlineCallbacks
def run(self):
self.gentooci =
self.master.namedServices['services'].namedServices['gentooci']
@@ -26,27 +33,25 @@ class AddCategory(BuildStep):
self.category_data['uuid'] = yield
self.gentooci.db.categorys.addCategory(self.category_data['name'])
print(self.category_data)
self.setProperty("category_data", self.category_data, 'category_data')
- self.setProperty("config_root", self.getProperty("config_root"),
'config_root')
- self.setProperty("project_data", self.getProperty("project_data"),
'project_data')
- self.setProperty("repository_data",
self.getProperty("repository_data"), 'repository_data')
- self.setProperty("cpv", self.getProperty("cpv"), 'cpv')
return SUCCESS
-class CheckCGentooCiProject(BuildStep):
+class CheckC(BuildStep):
def __init__(self, **kwargs):
super().__init__(**kwargs)
+ name = 'CheckC'
+ description = 'Running'
+ descriptionDone = 'Ran'
+ descriptionSuffix = None
+ haltOnFailure = True
+ flunkOnFailure = True
+
@defer.inlineCallbacks
def run(self):
self.gentooci =
self.master.namedServices['services'].namedServices['gentooci']
self.category = yield self.getProperty("cpv").split('/')[0]
print(self.category)
- print(self.getProperty("repository"))
self.category_data = yield
self.gentooci.db.categorys.getCategoryByName(self.category)
- self.setProperty("config_root", self.getProperty("config_root"),
'config_root')
- self.setProperty("project_data", self.getProperty("project_data"),
'project_data')
- self.setProperty("repository_data",
self.getProperty("repository_data"), 'repository_data')
- self.setProperty("cpv", self.getProperty("cpv"), 'cpv')
print(self.category_data)
if self.category_data is None:
self.setProperty("category", self.category, 'category')
diff --git a/buildbot_gentoo_ci/steps/package.py
b/buildbot_gentoo_ci/steps/package.py
index 3a28da2..ea5ab23 100644
--- a/buildbot_gentoo_ci/steps/package.py
+++ b/buildbot_gentoo_ci/steps/package.py
@@ -20,6 +20,13 @@ class AddPackage(BuildStep):
def __init__(self, **kwargs):
super().__init__(**kwargs)
+ name = 'AddPackage'
+ description = 'Running'
+ descriptionDone = 'Ran'
+ descriptionSuffix = None
+ haltOnFailure = True
+ flunkOnFailure = True
+
@defer.inlineCallbacks
def run(self):
self.gentooci =
self.master.namedServices['services'].namedServices['gentooci']
@@ -34,28 +41,25 @@ class AddPackage(BuildStep):
)
print(self.package_data)
self.setProperty("package_data", self.package_data, 'package_data')
- self.setProperty("config_root", self.getProperty("config_root"),
'config_root')
- self.setProperty("project_data", self.getProperty("project_data"),
'project_data')
- self.setProperty("repository_data",
self.getProperty("repository_data"), 'repository_data')
- self.setProperty("category_data", self.getProperty("category_data"),
'category_data')
- self.setProperty("cpv", self.getProperty("cpv"), 'cpv')
return SUCCESS
-class CheckPGentooCiProject(BuildStep):
+class CheckP(BuildStep):
def __init__(self, **kwargs):
super().__init__(**kwargs)
+ name = 'CheckP'
+ description = 'Running'
+ descriptionDone = 'Ran'
+ descriptionSuffix = None
+ haltOnFailure = True
+ flunkOnFailure = True
+
@defer.inlineCallbacks
def run(self):
self.gentooci =
self.master.namedServices['services'].namedServices['gentooci']
self.package = yield catpkgsplit(self.getProperty("cpv"))[1]
print(self.package)
self.package_data = yield
self.gentooci.db.packages.getPackageByName(self.package)
- self.setProperty("config_root", self.getProperty("config_root"),
'config_root')
- self.setProperty("project_data", self.getProperty("project_data"),
'project_data')
- self.setProperty("repository_data",
self.getProperty("repository_data"), 'repository_data')
- self.setProperty("category_data", self.getProperty("category_data"),
'category_data')
- self.setProperty("cpv", self.getProperty("cpv"), 'cpv')
print(self.package_data)
if self.package_data is None:
self.setProperty("package", self.package, 'package')
@@ -66,10 +70,17 @@ class CheckPGentooCiProject(BuildStep):
#yield self.build.addStepsAfterLastStep([CheckPathPackage()])
return SUCCESS
-class TriggerCheckVGentooCiProject(BuildStep):
+class TriggerCheckForV(BuildStep):
def __init__(self, **kwargs):
super().__init__(**kwargs)
+ name = 'TriggerCheckForV'
+ description = 'Running'
+ descriptionDone = 'Ran'
+ descriptionSuffix = None
+ haltOnFailure = True
+ flunkOnFailure = True
+
@defer.inlineCallbacks
def run(self):
addStepUpdateVData = []
@@ -81,17 +92,12 @@ class TriggerCheckVGentooCiProject(BuildStep):
set_properties={
'cpv' : self.getProperty("cpv"),
'package_data' : self.getProperty("package_data"),
- 'config_root' : self.getProperty("config_root"),
'repository_data' :
self.getProperty("repository_data"),
'category_data' :
self.getProperty("category_data"),
+ 'revision_data' :
self.getProperty("revision_data"),
+ 'project_data' : self.getProperty("project_data"),
}
)
)
yield self.build.addStepsAfterCurrentStep(addStepUpdateVData)
- self.setProperty("config_root", self.getProperty("config_root"),
'config_root')
- self.setProperty("project_data", self.getProperty("project_data"),
'project_data')
- self.setProperty("repository_data",
self.getProperty("repository_data"), 'repository_data')
- self.setProperty("category_data", self.getProperty("category_data"),
'category_data')
- self.setProperty("package_data", self.getProperty("package_data"),
'package_data')
- self.setProperty("cpv", self.getProperty("cpv"), 'cpv')
return SUCCESS
