From 2d295cd15f9fbfd7ba30041f95c10342f50079fa Mon Sep 17 00:00:00 2001 From: Craig Tracey Date: Tue, 17 Jun 2014 10:37:43 -0400 Subject: [PATCH] Add Octavia to Stackforge Adding the project definition for the Octavia project - an LBaaS reference implementation. Includes: - Adds project to Stackforge - Gerritbot for Freenode in #openstack-lbaas - Adds basic Python Jenkins and Zuul jobs - Adds Gerrit ACLs for the repo Change-Id: I1fcdefd295dc7f23be6fa66e523d269f6ca32b42 --- .../gerritbot/files/gerritbot_channel_config.yaml | 10 ++++++++++ .../openstack_project/files/accessbot/channels.yaml | 2 ++ .../files/gerrit/acls/stackforge/octavia.config | 11 +++++++++++ .../files/jenkins_job_builder/config/projects.yaml | 9 +++++++++ modules/openstack_project/files/review.projects.yaml | 2 ++ modules/openstack_project/files/zuul/layout.yaml | 12 ++++++++++++ modules/openstack_project/manifests/eavesdrop.pp | 1 + 7 files changed, 47 insertions(+) create mode 100644 modules/openstack_project/files/gerrit/acls/stackforge/octavia.config diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index ad6c2132f7..ca81d4ceda 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -796,3 +796,13 @@ nova-docker: - stackforge/nova-docker branches: - master + +openstack-lbaas: + events: + - patchset-created + - change-merged + - x-vrif-minus-2 + projects: + - stackforge/octavia + branches: + - master diff --git a/modules/openstack_project/files/accessbot/channels.yaml b/modules/openstack_project/files/accessbot/channels.yaml index 2536790aa2..0ef67a504d 100644 --- a/modules/openstack_project/files/accessbot/channels.yaml +++ b/modules/openstack_project/files/accessbot/channels.yaml @@ -123,3 +123,5 @@ channels: mask: full_mask - name: nova-docker mask: full_mask + - name: openstack-lbaas + mask: full_mask diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/octavia.config b/modules/openstack_project/files/gerrit/acls/stackforge/octavia.config new file mode 100644 index 0000000000..b062c122d1 --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/stackforge/octavia.config @@ -0,0 +1,11 @@ +[access "refs/heads/*"] + label-Code-Review = -2..+2 group octavia-core + label-Workflow = -1..+1 group octavia-core + abandon = group octavia-core +[access "refs/tags/*"] + pushSignedTag = group octavia-ptl +[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 77373c95ff..fedf37e419 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -2751,3 +2751,12 @@ jobs: - python-jobs + +- project: + name: octavia + github-org: stackforge + node: bare-precise + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index 4cc1ed71d2..426a21fdab 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -816,6 +816,8 @@ - project: stackforge/occi-os description: OCCI-OS provides a python egg which can be easily deployed in OpenStack and will thereby add OCCI support and interface to OpenStack. upstream: git://github.com/tmetsch/occi-os.git +- project: stackforge/octavia + description: An operator-grade reference implementation for Load Balancing as a Service (LBaaS) - project: stackforge/opencafe upstream: https://github.com/samu4924/opencafe description: Common Automation Framework Engine. Core driver for CloudCAFE diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 06411dbba5..a37e01b018 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -4632,3 +4632,15 @@ projects: - name: openstack-doc-gate post: - training-guides-tox-doc-publishdocs + + - name: stackforge/octavia + check: + - gate-octavia-pep8 + - gate-octavia-python26 + - gate-octavia-python27 + - gate-octavia-python33 + gate: + - gate-octavia-pep8 + - gate-octavia-python26 + - gate-octavia-python27 + - gate-octavia-python33 diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp index d41923af62..6c1e850670 100644 --- a/modules/openstack_project/manifests/eavesdrop.pp +++ b/modules/openstack_project/manifests/eavesdrop.pp @@ -49,6 +49,7 @@ class openstack_project::eavesdrop ( '#openstack-infra', '#openstack-ironic', '#openstack-keystone', + '#openstack-lbaas', '#openstack-marconi', '#openstack-meeting', '#openstack-meeting-alt',