| 1 |
commit: 5bcc246039548564d9e4037548f9cfd9f04328ed |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 26 07:44:22 2020 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 26 07:44:22 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=5bcc2460 |
| 7 |
|
| 8 |
Add usepkg and buildpkg as project options |
| 9 |
|
| 10 |
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> |
| 11 |
|
| 12 |
gosbs/db/sqlalchemy/models.py | 2 ++ |
| 13 |
gosbs/objects/project_option.py | 2 ++ |
| 14 |
gosbs/tasks/builder/build_pkg.py | 4 ++++ |
| 15 |
3 files changed, 8 insertions(+) |
| 16 |
|
| 17 |
diff --git a/gosbs/db/sqlalchemy/models.py b/gosbs/db/sqlalchemy/models.py |
| 18 |
index f42dacd..1f7d847 100644 |
| 19 |
--- a/gosbs/db/sqlalchemy/models.py |
| 20 |
+++ b/gosbs/db/sqlalchemy/models.py |
| 21 |
@@ -169,6 +169,8 @@ class ProjectsOptions(BASE, NovaBase): |
| 22 |
depclean = Column(Boolean(), default=False) |
| 23 |
oneshot = Column(Boolean(), default=False) |
| 24 |
removebin = Column(Boolean(), default=False) |
| 25 |
+ usepkg = Column(Boolean(), default=False) |
| 26 |
+ buildpkg = Column(Boolean(), default=False) |
| 27 |
|
| 28 |
class ProjectsBuilds(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin): |
| 29 |
"""Represents an image in the datastore.""" |
| 30 |
|
| 31 |
diff --git a/gosbs/objects/project_option.py b/gosbs/objects/project_option.py |
| 32 |
index 051c9d7..0826c41 100644 |
| 33 |
--- a/gosbs/objects/project_option.py |
| 34 |
+++ b/gosbs/objects/project_option.py |
| 35 |
@@ -77,6 +77,8 @@ class ProjectOption(base.NovaObject, base.NovaObjectDictCompat): |
| 36 |
'oneshot' : fields.BooleanField(), |
| 37 |
'removebin' : fields.BooleanField(), |
| 38 |
'depclean' : fields.BooleanField(), |
| 39 |
+ 'usepkg' : fields.BooleanField(), |
| 40 |
+ 'buildpkg' : fields.BooleanField(), |
| 41 |
} |
| 42 |
|
| 43 |
def __init__(self, *args, **kwargs): |
| 44 |
|
| 45 |
diff --git a/gosbs/tasks/builder/build_pkg.py b/gosbs/tasks/builder/build_pkg.py |
| 46 |
index bb86a05..240b201 100644 |
| 47 |
--- a/gosbs/tasks/builder/build_pkg.py |
| 48 |
+++ b/gosbs/tasks/builder/build_pkg.py |
| 49 |
@@ -125,6 +125,10 @@ def emeerge_cmd_options(context, build_job, project_options_db): |
| 50 |
argscmd = [] |
| 51 |
if project_options_db.oneshot: |
| 52 |
argscmd.append('--oneshot') |
| 53 |
+ if project_options_db.usepkg: |
| 54 |
+ argscmd.append('--usepkg') |
| 55 |
+ if project_options_db.buildpkg: |
| 56 |
+ argscmd.append('--buildpkg') |
| 57 |
argscmd.append('=' + build_job['cpv']) |
| 58 |
return argscmd |
Archives