From a3fda8fa7f93407bf66b9f60c0153c4ef60dfb55 Mon Sep 17 00:00:00 2001
From: Anita Kuno <anteaya@anteaya.info>
Date: Tue, 3 Mar 2015 15:14:12 -0500
Subject: [PATCH] Rename stackforge/bindep -> openstack-infra/bindep

This patch brings the stackforge/bindep repository under the
openstack-infra namespace.

The bindep-core gerrit group is preserved, infra-core will be
added to that group. A new bindep-release gerrit group is
created.

Depends-on: I94b4c119f46cd6d6b607f5abc394a63fb2b0b97f
Change-Id: I39309976c2d0c05bbcfa88dc0928547e34cc4e6e
---
 .../bindep.config                             |  2 +-
 gerrit/projects.yaml                          |  9 ++++--
 gerritbot/channels.yaml                       |  1 +
 jenkins/jobs/projects.yaml                    | 19 ++++++-------
 zuul/layout.yaml                              | 28 +++++++++----------
 5 files changed, 32 insertions(+), 27 deletions(-)
 rename gerrit/acls/{stackforge => openstack-infra}/bindep.config (87%)

diff --git a/gerrit/acls/stackforge/bindep.config b/gerrit/acls/openstack-infra/bindep.config
similarity index 87%
rename from gerrit/acls/stackforge/bindep.config
rename to gerrit/acls/openstack-infra/bindep.config
index 07c84b0a53..5d7d06e779 100644
--- a/gerrit/acls/stackforge/bindep.config
+++ b/gerrit/acls/openstack-infra/bindep.config
@@ -4,7 +4,7 @@ label-Code-Review = -2..+2 group bindep-core
 label-Workflow = -1..+1 group bindep-core
 
 [access "refs/tags/*"]
-pushSignedTag = group bindep-core
+pushSignedTag = group bindep-release
 
 [receive]
 requireChangeId = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 08423413e3..85ecff7083 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -61,6 +61,13 @@
   description: Theme for ask.openstack.org.
   options:
     - direct-release
+- project: openstack-infra/bindep
+  description: Binary dependency automation
+  use-storyboard: true
+  groups:
+    - openstack-ci
+  options:
+    - direct-release
 - project: openstack-infra/bugdaystats
   use-storyboard: true
   groups:
@@ -1151,8 +1158,6 @@
   description: Python AST-based static analyzer from OpenStack Security Group
 - project: stackforge/billingstack
   description: Billing software
-- project: stackforge/bindep
-  description: Binary dependency automation
 - project: stackforge/blazar
   description: Reservation Service for OpenStack
   acl-config: /home/gerrit2/acls/stackforge/blazar.config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 05b63a7580..fa1cc42cb5 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -408,6 +408,7 @@ openstack-infra:
       - openstack-dev/specs-cookiecutter
       - openstack-infra/ansible-puppet
       - openstack-infra/askbot-theme
+      - openstack-infra/bindep
       - openstack-infra/bugdaystats
       - openstack-infra/devstack-gate
       - openstack-infra/elastic-recheck
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 28bbb62821..2a57bbb827 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2037,6 +2037,15 @@
     jobs:
       - ansible-lint-jobs
 
+- project:
+    name: bindep
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
 - project:
     name: bugdaystats
     node: 'bare-precise || bare-trusty'
@@ -3003,16 +3012,6 @@
       - pypi-jobs
 
 
-- project:
-    name: bindep
-    node: 'bare-precise || bare-trusty'
-    tarball-site: tarballs.openstack.org
-
-    jobs:
-      - python-jobs
-      - pypi-jobs
-
-
 - project:
     name: blazar
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 27bc202876..fec646da68 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3348,6 +3348,20 @@ projects:
       - name: merge-check
       - name: noop-jobs
 
+  - name: openstack-infra/bindep
+    template:
+      - name: merge-check
+      - name: publish-to-pypi
+    check:
+      - gate-bindep-pep8
+      - gate-bindep-python27
+    gate:
+      - gate-bindep-pep8
+      - gate-bindep-python27
+    post:
+      - bindep-branch-tarball
+      - bindep-coverage
+
   - name: openstack-infra/bugdaystats
     template:
       - name: merge-check
@@ -4340,20 +4354,6 @@ projects:
       - billingstack-coverage
       - billingstack-branch-tarball
 
-  - name: stackforge/bindep
-    template:
-      - name: merge-check
-      - name: publish-to-pypi
-    check:
-      - gate-bindep-pep8
-      - gate-bindep-python27
-    gate:
-      - gate-bindep-pep8
-      - gate-bindep-python27
-    post:
-      - bindep-branch-tarball
-      - bindep-coverage
-
   - name: stackforge/blazar
     template:
       - name: merge-check