From 2fcdd1a41fea376d41173c1571bc73e29faf96e3 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Tue, 26 Mar 2013 00:42:08 +0400
Subject: [PATCH] Savanna project conf update - client added and acl fixed

Change-Id: I9e1b1ed5a0421ea83dfd9eda289bc3bb55870879
Reviewed-on: https://review.openstack.org/25331
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 .../files/gerritbot_channel_config.yaml       |  3 ++-
 .../stackforge/python-savannaclient.config    | 13 ++++++++++
 .../gerrit/acls/stackforge/savanna.config     |  2 ++
 .../jenkins_job_builder/config/projects.yaml  | 10 ++++++++
 .../openstack_project/files/zuul/layout.yaml  | 25 +++++++++++++++++++
 .../templates/review.projects.yaml.erb        |  1 +
 6 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/python-savannaclient.config

diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 1a72ac437a..3fb3bce8ae 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -151,6 +151,7 @@ savanna:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - openstack/savanna
+      - stackforge/savanna
+      - stackforge/python-savannaclient
     branches:
       - master
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-savannaclient.config b/modules/openstack_project/files/gerrit/acls/stackforge/python-savannaclient.config
new file mode 100644
index 0000000000..b104b3caf0
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/python-savannaclient.config
@@ -0,0 +1,13 @@
+[access "refs/*"]
+        owner = group Administrators
+        create = savanna-core
+        pushTag = savanna-core
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group savanna-core
+        label-Approved = +0..+1 group savanna-core
+        workInProgress = group savanna-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/savanna.config b/modules/openstack_project/files/gerrit/acls/stackforge/savanna.config
index da9b8ae1bf..6ba2175acb 100644
--- a/modules/openstack_project/files/gerrit/acls/stackforge/savanna.config
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/savanna.config
@@ -1,5 +1,7 @@
 [access "refs/*"]
         owner = group Administrators
+        create = group savanna-core
+        pushTag = group savanna-core
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group savanna-core
         label-Approved = +0..+1 group savanna-core
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index e79302dd72..f64e5c90b0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -18,6 +18,16 @@
       - python-jobs
       - gate-{name}-pyflakes
 
+- project:
+    name: python-savannaclient
+    github-org: stackforge
+    node: quantal
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - gate-{name}-pyflakes
+
 - project:
     name: kwapi
     github-org: stackforge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9421fb4d94..6fa123a8c0 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1384,3 +1384,28 @@ projects:
       - gate-savanna-python27
     post:
       - savanna-branch-tarball
+    pre-release:
+      - savanna-tarball
+    release:
+      - savanna-tarball:
+        - savanna-pypi-upload
+
+  - name: stackforge/python-savannaclient
+    check:
+      - gate-python-savannaclient-pyflakes:
+        - gate-python-savannaclient-pep8
+        - gate-python-savannaclient-python26
+        - gate-python-savannaclient-python26-rhel6
+        - gate-python-savannaclient-python27
+    gate:
+      - gate-python-savannaclient-pep8
+      - gate-python-savannaclient-pyflakes
+      - gate-python-savannaclient-python26
+      - gate-python-savannaclient-python27
+    post:
+      - python-savannaclient-branch-tarball
+    pre-release:
+       - python-savannaclient-tarball
+    release:
+       - python-savannaclient-tarball:
+         - python-savannaclient-pypi-upload
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index cb3c0dd5be..6db157c653 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -121,3 +121,4 @@
 - project: stackforge/savanna
   description: "Savanna aims to provide users with simple means to provision a Hadoop cluster by specifying several parameters like Hadoop version, cluster topology, nodes hardware details and a few more."
   upstream: git://github.com/Mirantis/savanna.git
+- project: stackforge/python-savannaclient