diff options
| -rwxr-xr-x | lorry-controller-webapp | 5 | ||||
| -rw-r--r-- | lorrycontroller/gerrit.py | 7 | ||||
| -rw-r--r-- | lorrycontroller/gitano.py | 6 | ||||
| -rw-r--r-- | lorrycontroller/gitlab.py | 10 |
4 files changed, 25 insertions, 3 deletions
diff --git a/lorry-controller-webapp b/lorry-controller-webapp index 6fc827e..2c99c08 100755 --- a/lorry-controller-webapp +++ b/lorry-controller-webapp @@ -143,6 +143,11 @@ class WEBAPP(cliapp.Application): ['publish-failures'], 'make the status page show failure logs from lorry') + self.settings.choice( + ['downstream-visibility'], + ['private', 'internal', 'public'], + 'Visibility of repositories created on Downstream Host (GitLab)') + for downstream_type in lorrycontroller.downstream_types.values(): downstream_type.add_app_settings(self.settings) diff --git a/lorrycontroller/gerrit.py b/lorrycontroller/gerrit.py index dd82ff8..c5498e2 100644 --- a/lorrycontroller/gerrit.py +++ b/lorrycontroller/gerrit.py @@ -21,7 +21,6 @@ from . import hosts class GerritDownstream(hosts.DownstreamHost): - '''Run commands on a Gerrit instance. This uses the SSH API to Gerrit. The REST API is actually much nicer to @@ -31,6 +30,12 @@ class GerritDownstream(hosts.DownstreamHost): ''' + @staticmethod + def check_app_settings(app_settings): + if app_settings['downstream-visibility'] != 'private': + raise cliapp.ApplicationError( + 'Cannot create non-private repositories in Gerrit') + def __init__(self, app_settings): # XXX These need to be configurable host = 'localhost' diff --git a/lorrycontroller/gitano.py b/lorrycontroller/gitano.py index 499bb5d..87e2182 100644 --- a/lorrycontroller/gitano.py +++ b/lorrycontroller/gitano.py @@ -144,6 +144,12 @@ class _LocalTroveGitanoCommand(_GitanoCommand): class GitanoDownstream(hosts.DownstreamHost): + @staticmethod + def check_app_settings(app_settings): + if app_settings['downstream-visibility'] != 'private': + raise cliapp.ApplicationError( + 'Cannot create non-private repositories in Gitano') + def __init__(self, app_settings): self._gitano = _LocalTroveGitanoCommand() diff --git a/lorrycontroller/gitlab.py b/lorrycontroller/gitlab.py index 4f70f0a..eda9c9d 100644 --- a/lorrycontroller/gitlab.py +++ b/lorrycontroller/gitlab.py @@ -66,6 +66,8 @@ class GitlabDownstream(hosts.DownstreamHost): self.gl = _init_gitlab(host, app_settings['gitlab-private-token']) + self._visibility = app_settings['downstream-visibility'] + def prepare_repo(self, repo_path, metadata): try: @@ -101,7 +103,11 @@ class GitlabDownstream(hosts.DownstreamHost): except gitlab.GitlabGetError as e: if e.response_code != 404: raise - data = {'name': group_name, 'path': group_name} + data = { + 'name': group_name, + 'path': group_name, + 'visibility': self._visibility, + } if parent_group is not None: data['parent_id'] = parent_group.id group = self.gl.groups.create(data) @@ -109,7 +115,7 @@ class GitlabDownstream(hosts.DownstreamHost): project = { 'name': path_comps[-1], - 'public': True, + 'visibility': self._visibility, 'merge_requests_enabled': False, 'namespace_id': group.id, 'default_branch': metadata.get('head'), |