From 7265b3f5a91efb1917ce6352724c92cb404aec6f Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 5 Aug 2013 17:38:55 -0300
Subject: [PATCH] Add oslo.version

oslo.version is the version code split out from pbr combined with the
additional version code from nova.

Change-Id: Ia91acdc6b623554c84e8fc641c44847f59b57b07
---
 .../files/update_gerrit_users.py              |  1 +
 .../gerrit/acls/openstack/oslo.version.config | 16 +++++++++
 .../jenkins_job_builder/config/projects.yaml  | 13 ++++++++
 .../files/zuul/layout-dev.yaml                |  8 +++++
 .../openstack_project/files/zuul/layout.yaml  | 33 +++++++++++++++++++
 .../templates/review.projects.yaml.erb        |  2 ++
 6 files changed, 73 insertions(+)
 create mode 100644 modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config

diff --git a/modules/launchpad_sync/files/update_gerrit_users.py b/modules/launchpad_sync/files/update_gerrit_users.py
index 6850d57659..f0c4f0e675 100755
--- a/modules/launchpad_sync/files/update_gerrit_users.py
+++ b/modules/launchpad_sync/files/update_gerrit_users.py
@@ -262,6 +262,7 @@ class Sync(object):
                 'openstack/oslo-incubator',
                 'openstack/oslo.config',
                 'openstack/oslo.messaging',
+                'openstack/oslo.version',
                 'openstack/python-ceilometerclient',
                 'openstack/python-cinderclient',
                 'openstack/python-glanceclient',
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config b/modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config
new file mode 100644
index 0000000000..bc653a49d1
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/oslo.version.config
@@ -0,0 +1,16 @@
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group oslo-core
+        label-Approved = +0..+1 group oslo-core
+[access "refs/heads/milestone-proposed"]
+        label-Code-Review = -2..+2 group oslo-milestone
+        label-Approved = +0..+1 group oslo-milestone
+[access "refs/tags/*"]
+        create = group oslo-core
+        pushTag = group oslo-core
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
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 fbfa721a36..0674503409 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -547,6 +547,19 @@
       - gate-{name}-pyflakes
 
 
+- project:
+    name: oslo.version
+    github-org: openstack
+    node: precise
+    tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
+
+    jobs:
+      - python-jobs
+      - openstack-publish-jobs
+      - pypi-jobs
+
+
 - project:
     name: oslo-incubator
     github-org: openstack
diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/modules/openstack_project/files/zuul/layout-dev.yaml
index 31a099e985..0ed8128736 100644
--- a/modules/openstack_project/files/zuul/layout-dev.yaml
+++ b/modules/openstack_project/files/zuul/layout-dev.yaml
@@ -249,6 +249,14 @@ projects:
       - gate-oslo.messaging-python26
       - gate-oslo.messaging-python27
 
+  - name: openstack/oslo.version
+    check:
+      - gate-oslo.version-requirements
+      - gate-oslo.version-pep8
+      - gate-oslo.version-docs
+      - gate-oslo.version-python26
+      - gate-oslo.version-python27
+
   - name: openstack/neutron
     check:
       - gate-neutron-requirements
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index b49e909277..7edbb65899 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -882,6 +882,39 @@ projects:
           - post-mirror-python27
           - post-mirror-python33
 
+  - name: openstack/oslo.version
+    check:
+      - gate-oslo.version-requirements
+      - gate-oslo.version-pep8
+      - gate-oslo.version-docs
+      - gate-oslo.version-python26
+      - gate-oslo.version-python27
+      - gate-oslo.version-python33
+      - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-neutron
+      - gate-grenade-devstack-vm
+    gate:
+      - gate-oslo.version-requirements
+      - gate-oslo.version-docs
+      - gate-oslo.version-pep8
+      - gate-oslo.version-python26
+      - gate-oslo.version-python27
+      - gate-oslo.version-python33
+      - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-neutron
+      - gate-grenade-devstack-vm
+    post:
+      - oslo.version-branch-tarball
+      - oslo.version-docs
+    pre-release:
+      - oslo.version-tarball
+    release:
+      - oslo.version-tarball:
+        - oslo.version-pypi-upload:
+          - post-mirror-python26
+          - post-mirror-python27
+      - oslo.version-docs
+
   - name: openstack/neutron
     check:
       - gate-neutron-requirements
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 502cb8e6ba..6b09c31072 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -111,6 +111,8 @@
   upstream: git://github.com/markmc/oslo.messaging.git
 - project: openstack/oslo.sphinx
   description: "Theme and utilities for Sphinx documentation tool"
+- project: openstack/oslo.config
+  upstream: git://github.com/emonty/oslo.version.git
 - project: openstack/python-ceilometerclient
   upstream: git://github.com/asalkeld/python-ceilometerclient.git
 - project: openstack/python-cinderclient