From 087d35ae904ef3936cdb16549e0004291cc2f206 Mon Sep 17 00:00:00 2001 From: Derek Higgins <derekh@redhat.com> Date: Wed, 17 Jul 2013 09:58:56 +0100 Subject: [PATCH] Pull toci into openstack-infra Change-Id: I61a5c713076f7267e13e5dd8000fcc37c03e613c --- .../gerritbot/files/gerritbot_channel_config.yaml | 1 + .../gerrit/acls/openstack-infra/tripleo-ci.config | 12 ++++++++++++ modules/openstack_project/files/zuul/layout.yaml | 6 ++++++ .../templates/review.projects.yaml.erb | 3 +++ 4 files changed, 22 insertions(+) create mode 100644 modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 3ea023239e..94005732e0 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -142,6 +142,7 @@ tripleo: - stackforge/tripleo-image-elements - openstack/tripleo-incubator - stackforge/tripleo-heat-templates + - openstack-infra/tripleo-ci branches: - master diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config new file mode 100644 index 0000000000..41c8a08ed8 --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/tripleo-ci.config @@ -0,0 +1,12 @@ +[receive] + requireChangeId = true + requireContributorAgreement = true +[submit] + mergeContent = true +[access "refs/heads/*"] + label-Code-Review = -2..+2 group toci-core + label-Approved = +0..+1 group toci-core + workInProgress = group toci-core +[access "refs/heads/milestone-proposed"] + label-Code-Review = -2..+2 group toci-core + label-Approved = +0..+1 group toci-core diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 0365fc7d7c..95c380d591 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -2434,3 +2434,9 @@ projects: - gate-python-ipmi-pep8 gate: - gate-python-ipmi-pep8 + + - name: openstack-infra/tripleo-ci + check: + - gate-noop + gate: + - gate-noop diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb index d42d8a7bac..b700580fde 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -61,6 +61,9 @@ description: OpenStack Design Summit session management system - project: openstack-infra/statusbot description: Infrastructure status update IRC bot +- project: openstack-infra/tripleo-ci + description: "CI for the tripleo project" + upstream: https://github.com/toci-dev/toci - project: openstack-infra/zmq-event-publisher description: Jenkins plugin to publish build events via ZMQ PUB SUB. upstream: git://github.com/cboylan/zmq-event-publisher.git