[gentoo-commits] proj/tinderbox-cluster:master commit in: gosbs/db/sqlalchemy/, gosbs/tasks/builder/, gosbs/objects/

[Magnus Granberg]

commit:     5bcc246039548564d9e4037548f9cfd9f04328ed
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 07:44:22 2020 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 07:44:22 2020 +0000
URL:        
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=5bcc2460

Add usepkg and buildpkg as project options

Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>

 gosbs/db/sqlalchemy/models.py    | 2 ++
 gosbs/objects/project_option.py  | 2 ++
 gosbs/tasks/builder/build_pkg.py | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/gosbs/db/sqlalchemy/models.py b/gosbs/db/sqlalchemy/models.py
index f42dacd..1f7d847 100644
--- a/gosbs/db/sqlalchemy/models.py
+++ b/gosbs/db/sqlalchemy/models.py
@@ -169,6 +169,8 @@ class ProjectsOptions(BASE, NovaBase):
     depclean = Column(Boolean(), default=False)
     oneshot = Column(Boolean(), default=False)
     removebin = Column(Boolean(), default=False)
+    usepkg = Column(Boolean(), default=False)
+    buildpkg = Column(Boolean(), default=False)
 
 class ProjectsBuilds(BASE, NovaBase, models.TimestampMixin, 
models.SoftDeleteMixin):
     """Represents an image in the datastore."""

diff --git a/gosbs/objects/project_option.py b/gosbs/objects/project_option.py
index 051c9d7..0826c41 100644
--- a/gosbs/objects/project_option.py
+++ b/gosbs/objects/project_option.py
@@ -77,6 +77,8 @@ class ProjectOption(base.NovaObject, 
base.NovaObjectDictCompat):
         'oneshot' : fields.BooleanField(),
         'removebin' : fields.BooleanField(),
         'depclean' : fields.BooleanField(),
+        'usepkg' : fields.BooleanField(),
+        'buildpkg' : fields.BooleanField(),
         }
 
     def __init__(self, *args, **kwargs):

diff --git a/gosbs/tasks/builder/build_pkg.py b/gosbs/tasks/builder/build_pkg.py
index bb86a05..240b201 100644
--- a/gosbs/tasks/builder/build_pkg.py
+++ b/gosbs/tasks/builder/build_pkg.py
@@ -125,6 +125,10 @@ def emeerge_cmd_options(context, build_job, 
project_options_db):
     argscmd = []
     if project_options_db.oneshot:
         argscmd.append('--oneshot')
+    if project_options_db.usepkg:
+        argscmd.append('--usepkg')
+    if project_options_db.buildpkg:
+        argscmd.append('--buildpkg')
     argscmd.append('=' + build_job['cpv'])
     return argscmd