commit 9023a46782563dd75283788fd5757e1148004a66
author Sean Dague <sdague@linux.vnet.ibm.com> Mon May 06 06:53:10 2013 -0400
committer Jenkins <jenkins@review.openstack.org> Mon May 06 19:48:32 2013 +0000
tree 6c90ca23e8f40a17d0f60d2094447c47240b24ff
parent ac4081fcd51e393f8395793e16737bc1036a26ed

factor out gerrit project creator account

this lets you set the gerrit project creator account in yaml,
instead of it being hardcoded in the script

Change-Id: I08870255fd3f44b8e2ed04ed7a7e80a3dfe2dd39
Reviewed-on: https://review.openstack.org/28286
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins

jeepyb/cmd/manage_projects.py

diff --git a/jeepyb/cmd/manage_projects.py b/jeepyb/cmd/manage_projects.py
index 82531f2..429367c 100644
--- a/jeepyb/cmd/manage_projects.py
+++ b/jeepyb/cmd/manage_projects.py
@@ -21,6 +21,7 @@
 #   gerrit-host: review.openstack.org
 #   local-git-dir: /var/lib/git
 #   gerrit-key: /home/gerrit2/review_site/etc/ssh_host_rsa_key
+#   gerrit-committer: Project Creator <openstack-infra@lists.openstack.org>
 #   has-github: True
 #   has-wiki: False
 #   has-issues: False
@@ -153,9 +154,8 @@
     return False
 
 
-def push_acl_config(project, remote_url, repo_path, env={}):
-    cmd = "commit -a -m'Update project config.' --author='Openstack Project " \
-          "Creator <openstack-infra@lists.openstack.org>'"
+def push_acl_config(project, remote_url, repo_path, gitid, env={}):
+    cmd = "commit -a -m'Update project config.' --author='%s'" % gitid
     status = git_command(repo_path, cmd)
     if status != 0:
         print "Failed to commit config for project: %s" % project
@@ -298,6 +298,7 @@
     GERRIT_HOST = defaults.get('gerrit-host')
     GERRIT_USER = defaults.get('gerrit-user')
     GERRIT_KEY = defaults.get('gerrit-key')
+    GERRIT_GITID = defaults.get('gerrit-committer')
 
     gerrit = gerritlib.gerrit.Gerrit('localhost',
                                      GERRIT_USER,
@@ -346,9 +347,8 @@
 project=%s
 """ % (GERRIT_HOST, project_git))
                         git_command(repo_path, "add .gitreview")
-                        cmd = "commit -a -m'Added .gitreview' --author=" \
-                              "'Openstack Project Creator " \
-                              "<openstack-infra@lists.openstack.org>'"
+                        cmd = ("commit -a -m'Added .gitreview' --author='%s'"
+                               % GERRIT_GITID)
                         git_command(repo_path, cmd)
                         push_string = "push --all %s"
                     gerrit.createProject(project)
@@ -396,6 +396,7 @@
                         push_acl_config(project,
                                         remote_url,
                                         repo_path,
+                                        GERRIT_GITID,
                                         ssh_env)
                 finally:
                     run_command("rm -fr %s" % tmpdir)