diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 5a10fb0ae4..2a9abb40e7 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -320,6 +320,16 @@ openstack-chef: - stable/grizzly - stable/havana +openstack-merlin: + events: + - patchset-created + - change-merged + - x-vrif-minus-2 + projects: + - stackforge/merlin + branches: + - master + openstack-mistral: events: - patchset-created diff --git a/modules/openstack_project/files/accessbot/channels.yaml b/modules/openstack_project/files/accessbot/channels.yaml index 96c300f18f..6915183afa 100644 --- a/modules/openstack_project/files/accessbot/channels.yaml +++ b/modules/openstack_project/files/accessbot/channels.yaml @@ -98,6 +98,7 @@ channels: - open_stack - name: openstack-meniscus - name: openstack-merges + - name: openstack-merlin - name: openstack-metering - name: openstack-monasca - name: openstack-neutron diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/merlin.config b/modules/openstack_project/files/gerrit/acls/stackforge/merlin.config new file mode 100644 index 0000000000..b6e9754a3b --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/stackforge/merlin.config @@ -0,0 +1,14 @@ +[access "refs/heads/*"] +abandon = group merlin-core +label-Code-Review = -2..+2 group merlin-core +label-Workflow = -1..+1 group merlin-core + +[access "refs/tags/*"] +pushSignedTag = group merlin-release + +[receive] +requireChangeId = true +requireContributorAgreement = true + +[submit] +mergeContent = true diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index e739c9e8d8..ad6b08bd50 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -848,6 +848,8 @@ - project: stackforge/manila description: Shared filesystem management project for OpenStack. upstream: git://github.com/bswartz/manila.git +- project: stackforge/merlin + description: Framework for building UIs for OpenStack projects dealing with complex input data - project: stackforge/milk description: ETC cloud API framework project upstream: git://github.com/sarob/milk.git diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index fa931c3661..f4501b2d42 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -4043,6 +4043,14 @@ projects: - manila-branch-tarball - manila-coverage + - name: stackforge/merlin + template: + - name: merge-check + check: + - noop + gate: + - noop + - name: stackforge/milk template: - name: merge-check