From a356829607e408e8851cd8130c4697db8f1d83bd Mon Sep 17 00:00:00 2001
From: Geoff Arnold <geoff@geoffarnold.com>
Date: Fri, 29 May 2015 13:09:27 -0700
Subject: [PATCH] Add Stackforge project Mercador

This is commit 1/3. Mercador is a project for OpenStack service federation,
building on the Keystone work in Kilo. The project is described here:

https://wiki.openstack.org/wiki/Mercador

Change-Id: I350d3f6b727b31c13afc77ff55eecaabec475c90
---
 accessbot/channels.yaml                |  1 +
 gerrit/acls/stackforge/mercador.config | 14 ++++++++++++++
 gerrit/projects.yaml                   |  4 ++++
 gerritbot/channels.yaml                | 10 ++++++++++
 jenkins/jobs/projects.yaml             |  9 +++++++++
 zuul/layout.yaml                       |  6 ++++++
 6 files changed, 44 insertions(+)
 create mode 100644 gerrit/acls/stackforge/mercador.config

diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml
index ba4e724604..ea55460452 100644
--- a/accessbot/channels.yaml
+++ b/accessbot/channels.yaml
@@ -123,6 +123,7 @@ channels:
     meetbots:
       - open_stack
   - name: openstack-meniscus
+  - name: openstack-mercador
   - name: openstack-merges
   - name: openstack-merlin
   - name: openstack-metering
diff --git a/gerrit/acls/stackforge/mercador.config b/gerrit/acls/stackforge/mercador.config
new file mode 100644
index 0000000000..2bca429298
--- /dev/null
+++ b/gerrit/acls/stackforge/mercador.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group mercador-core
+label-Code-Review = -2..+2 group mercador-core
+label-Workflow = -1..+1 group mercador-core
+
+[access "refs/tags/*"]
+pushSignedTag = group mercador-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 88448736d2..a579c9f3d1 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1765,6 +1765,10 @@
   description: Key-value database service for OpenStack cloud.
 - project: stackforge/magnetodb-specs
   description: Design Specifications for MagnetoDB project
+- project: stackforge/mercador-pub
+  description: Mercador cloud service federation - publisher
+  upstream: git://github.com/geoffarnold/mercador-pub.git
+  acl-config: /home/gerrit2/acls/stackforge/mercador.config
 - project: stackforge/merlin
   description: Framework for building UIs for OpenStack projects dealing with complex
     input data
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 14fbe5d1a0..65d529d43d 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -701,6 +701,16 @@ openstack-manila:
     branches:
       - master
 
+openstack-mercador:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/mercador-pub
+    branches:
+      - master
+
 openstack-merges:
     events:
       - change-merged
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 5a1c67bcbd..9764fcf552 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4112,6 +4112,15 @@
       - 'gate-{name}-tox-{envlist}':
           envlist: bandit
 
+- project:
+   name: mercador-pub
+   node: 'bare-precise || bare-trusty'
+   tarball-site: tarballs.openstack.org
+
+   jobs:
+     - python-jobs
+     - pypi-jobs
+
 - project:
     name: merlin
     node: 'bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index dec42255af..2debd2f3ab 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5997,6 +5997,12 @@ projects:
       - name: stackforge-specs-jobs
       - name: docs-on-rtfd
 
+  - name: stackforge/mercador-pub
+    template:
+      - name: merge-check
+      - name: python-jobs
+      - name: publish-to-pypi
+
   - name: stackforge/merlin
     template:
       - name: merge-check