Merge branch 'master' into 'bwh/gitea-support'

# Conflicts:
#   lorry-controller-webapp

1 files changed, 28 insertions, 12 deletions

diff --git a/lorrycontroller/gerrit.py b/lorrycontroller/gerrit.py
index 5a35920..c2c81b8 100644
--- a/lorrycontroller/gerrit.py
+++ b/lorrycontroller/gerrit.py
@@ -31,6 +31,14 @@ class GerritDownstream(hosts.DownstreamHost):
     '''
 
     @staticmethod
+    def add_app_settings(app_settings):
+        app_settings.string(
+            ['gerrit-parent-project'],
+            'parent project for repositories on Gerrit',
+            default='All-Projects',
+            metavar='PROJECT')
+
+    @staticmethod
     def check_app_settings(app_settings):
         if app_settings['downstream-visibility'] != 'private':
             raise cliapp.ApplicationError(
@@ -46,6 +54,8 @@ class GerritDownstream(hosts.DownstreamHost):
         self._ssh_command = hosts.SshCommand(
             url, StrictHostKeyChecking=key_check)
 
+        self._parent_project = app_settings['gerrit-parent-project']
+
     def _has_project(self, name):
         # There's no 'does this project exist' command in Gerrit 2.9.4; 'list
         # all projects with this prefix' is as close we can get.
@@ -69,18 +79,24 @@ class GerritDownstream(hosts.DownstreamHost):
         if self._has_project(name):
             logging.info('Project %s exists in local Gerrit already.',
                          name)
-        else:
-            self._ssh_command.run(['gerrit', 'create-project', name])
-            logging.info('Created %s project in local Gerrit.', name)
 
-        # We can only set this metadata if we're the owner of the
-        # repository.  For now, ignore failures.
-        try:
+            # We can only set this metadata if we're the owner of the
+            # repository.  For now, ignore failures.
+            try:
+                if 'head' in metadata:
+                    self._ssh_command.run(['gerrit', 'set-head', name,
+                                           '--new-head', metadata['head']])
+                if 'description' in metadata:
+                    self._ssh_command.run(['gerrit', 'set-project', name,
+                                           '-d', metadata['description']])
+            except cliapp.AppException:
+                pass
+        else:
+            create_args = ['gerrit', 'create-project', name,
+                           '-p', self._parent_project]
             if 'head' in metadata:
-                self._ssh_command.run(['gerrit', 'set-head', name,
-                                       '--new-head', metadata['head']])
+                create_args.extend(['-b', metadata['head']])
             if 'description' in metadata:
-                self._ssh_command.run(['gerrit', 'set-project', name,
-                                       '-d', metadata['description']])
-        except cliapp.AppException:
-            pass
+                create_args.extend(['-d', metadata['description']])
+            self._ssh_command.run(create_args)
+            logging.info('Created %s project in local Gerrit.', name)