From ca0b4342feb8a1b752071ac70ae7b3471a94dc3b Mon Sep 17 00:00:00 2001 From: Craig Bryant Date: Thu, 26 Jun 2014 14:22:31 -0600 Subject: [PATCH] Add Monasca sub projects These sub projects together with python-monascaclient comprise the Monasca monitoring project. The Monasca name is new, so the projects are being renamed from names like mon-notification to monasca-notification. Signing the OpenStack Contributer Agreement is required to contribute to Monasca. The Monasca chef cookbook projects are being put in the group monasca and not openstack-chef because Monasca is not an official OpenStack project. Some sub projects don't have builds because their builds won't work in StackForge. We wanted to get all of the sub projects in and then fix the builds later. I have created all of the projects on pypi that are needed. The template chef-jobs was added to modules/openstack_project/files/zuul/layout.yaml to simplify the monasca chef project declarations. It can be reused by other chef projects. Change-Id: Iea2d47b0878439c580b9607fa50b4ea3b98929f8 --- .../jenkins_job_builder/config/projects.yaml | 109 +++++++++++++++++- .../files/review.projects.yaml | 70 +++++++++++ .../openstack_project/files/zuul/layout.yaml | 104 +++++++++++++++++ 3 files changed, 282 insertions(+), 1 deletion(-) 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 320389d885..242647870e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -77,6 +77,63 @@ - python-jobs - pypi-jobs +- project: + name: monasca-agent + github-org: stackforge + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - pypi-jobs + +- project: + name: monasca-ceilometer + github-org: stackforge + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + +- project: + name: monasca-common + github-org: stackforge + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - maven-plugin-jobs + +- project: + name: monasca-notification + github-org: stackforge + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - pypi-jobs + +- project: + name: monasca-thresh + github-org: stackforge + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - maven-plugin-jobs + +- project: + name: monasca-ui + github-org: stackforge + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - pypi-jobs + - project: name: python-mistralclient github-org: stackforge @@ -141,7 +198,7 @@ - project: name: python-monascaclient github-org: stackforge - node: bare-precise + node: 'bare-precise || bare-trusty' tarball-site: tarballs.openstack.org jobs: @@ -1954,6 +2011,56 @@ - gate-{name}-chef-style - gate-{name}-chef-unit +- project: + name: cookbook-monasca-agent + github-org: stackforge + node: 'bare-precise || bare-trusty' + + jobs: + - gate-{name}-chef-lint + - gate-{name}-chef-style + - gate-{name}-chef-unit + +- project: + name: cookbook-monasca-api + github-org: stackforge + node: 'bare-precise || bare-trusty' + + jobs: + - gate-{name}-chef-lint + - gate-{name}-chef-style + - gate-{name}-chef-unit + +- project: + name: cookbook-monasca-notification + github-org: stackforge + node: 'bare-precise || bare-trusty' + + jobs: + - gate-{name}-chef-lint + - gate-{name}-chef-style + - gate-{name}-chef-unit + +- project: + name: cookbook-monasca-persister + github-org: stackforge + node: 'bare-precise || bare-trusty' + + jobs: + - gate-{name}-chef-lint + - gate-{name}-chef-style + - gate-{name}-chef-unit + +- project: + name: cookbook-monasca-thresh + github-org: stackforge + node: 'bare-precise || bare-trusty' + + jobs: + - gate-{name}-chef-lint + - gate-{name}-chef-style + - gate-{name}-chef-unit + - project: name: cookbook-openstack-client github-org: stackforge diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index c63fd66aca..895655dd06 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -562,6 +562,31 @@ acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: - direct-release +- project: stackforge/cookbook-monasca-agent + description: Chef Cookbook - Monasca Agent + group: monasca + upstream: git://github.com/hpcloud-mon/cookbooks-mon_agent + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/cookbook-monasca-api + description: Chef Cookbook - Monasca REST API + group: monasca + upstream: git://github.com/hpcloud-mon/cookbooks-mon_api + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/cookbook-monasca-notification + description: Chef Cookbook - Monasca Notification Engine + group: monasca + upstream: git://github.com/hpcloud-mon/cookbooks-mon_notification + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/cookbook-monasca-persister + description: Chef Cookbook - Monasca Database Persister + group: monasca + upstream: git://github.com/hpcloud-mon/cookbooks-mon_persister + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/cookbook-monasca-thresh + description: Chef Cookbook - Monasca Thresholding Engine + group: monasca + upstream: git://github.com/hpcloud-mon/cookbooks-mon_thresh + acl-config: /home/gerrit2/acls/stackforge/monasca.config - project: stackforge/cookbook-openstack-block-storage group: openstack-chef docimpact-group: openstack-chef @@ -792,6 +817,51 @@ group: mistral upstream: git://github.com/rakhmerov/mistral-extra.git acl-config: /home/gerrit2/acls/stackforge/mistral.config +- project: stackforge/monasca-agent + description: Agent for Monasca + group: monasca + upstream: git://github.com/hpcloud-mon/mon-agent + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/monasca-api + description: Monasca REST API + group: monasca + upstream: git://github.com/hpcloud-mon/mon-api + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/monasca-ceilometer + description: Integration between Monasca and Ceilometer + group: monasca + upstream: git://github.com/hpcloud-mon/mon-ceilometer + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/monasca-common + description: Monasca common classes + group: monasca + upstream: git://github.com/hpcloud-mon/mon-common + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/monasca-notification + description: Notification Engine for Monasca + group: monasca + upstream: git://github.com/hpcloud-mon/mon-notification + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/monasca-persister + description: Monasca Database Persister + group: monasca + upstream: git://github.com/hpcloud-mon/mon-persister + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/monasca-thresh + description: Monasca Thresholding Engine + group: monasca + upstream: git://github.com/hpcloud-mon/mon-thresh + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/monasca-ui + description: Horizon UI for Monasca + group: monasca + upstream: git://github.com/hpcloud-mon/mon-ui + acl-config: /home/gerrit2/acls/stackforge/monasca.config +- project: stackforge/monasca-vagrant + description: Vagrant test environment for Monasca + group: monasca + upstream: git://github.com/hpcloud-mon/mon-vagrant + acl-config: /home/gerrit2/acls/stackforge/monasca.config - project: stackforge/MRaaS - project: stackforge/murano upstream: git://github.com/Mirantis/murano-api.git diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 8b6a922cbe..3c38b82cc8 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -370,6 +370,14 @@ project-templates: release: - 'hook-{name}-rtfd' + - name: chef-jobs + check: + - 'gate-{name}-chef-lint' + - 'gate-{name}-chef-style' + - 'gate-{name}-chef-unit' + gate: + - 'gate-{name}-chef-lint' + - 'gate-{name}-chef-unit' jobs: - name: ^.*$ @@ -3292,6 +3300,26 @@ projects: - gate-cookbook-ceph-chef-lint - gate-cookbook-ceph-chef-unit + - name: stackforge/cookbook-monasca-agent + template: + - name: chef-jobs + + - name: stackforge/cookbook-monasca-api + template: + - name: chef-jobs + + - name: stackforge/cookbook-monasca-notification + template: + - name: chef-jobs + + - name: stackforge/cookbook-monasca-persister + template: + - name: chef-jobs + + - name: stackforge/cookbook-monasca-thresh + template: + - name: chef-jobs + - name: stackforge/cookbook-openstack-client check: - gate-cookbook-openstack-client-chef-lint @@ -3719,6 +3747,82 @@ projects: gate: - noop + - name: stackforge/monasca-agent + template: + - name: publish-to-pypi + check: + - gate-monasca-agent-pep8 + - gate-monasca-agent-python27 + gate: + - gate-monasca-agent-pep8 + - gate-monasca-agent-python27 + post: + - monasca-agent-coverage + + - name: stackforge/monasca-api + check: + - noop + gate: + - noop + + - name: stackforge/monasca-ceilometer + check: + - gate-monasca-ceilometer-pep8 + gate: + - gate-monasca-ceilometer-pep8 + + - name: stackforge/monasca-common + check: + - gate-monasca-common-build + gate: + - gate-monasca-common-build + post: + - monasca-common-localrepo-upload + + - name: stackforge/monasca-notification + template: + - name: publish-to-pypi + check: + - gate-monasca-notification-pep8 + - gate-monasca-notification-python27 + gate: + - gate-monasca-notification-pep8 + - gate-monasca-notification-python27 + post: + - monasca-notification-coverage + + - name: stackforge/monasca-persister + check: + - noop + gate: + - noop + + - name: stackforge/monasca-thresh + check: + - gate-monasca-thresh-build + gate: + - gate-monasca-thresh-build + post: + - monasca-thresh-localrepo-upload + + - name: stackforge/monasca-ui + template: + - name: publish-to-pypi + check: + - gate-monasca-ui-pep8 + - gate-monasca-ui-python27 + gate: + - gate-monasca-ui-pep8 + - gate-monasca-ui-python27 + post: + - monasca-ui-coverage + + - name: stackforge/monasca-vagrant + check: + - noop + gate: + - noop + - name: stackforge/murano-agent template: - name: python-jobs