diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index f31622fd88..eec19836e0 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -435,6 +435,7 @@ openstack-marconi: - x-vrif-minus-2 projects: - openstack/marconi + - openstack/marconi-specs - openstack/python-marconiclient branches: - master diff --git a/modules/openstack_project/files/gerrit/acls/openstack/marconi-specs.config b/modules/openstack_project/files/gerrit/acls/openstack/marconi-specs.config new file mode 100644 index 0000000000..61f7f47413 --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack/marconi-specs.config @@ -0,0 +1,11 @@ +[access "refs/heads/*"] + label-Code-Review = -2..+2 group marconi-specs-core + label-Workflow = -1..+1 group marconi-specs-core + abandon = group marconi-specs-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 2396cac2eb..5bbcb498ad 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1241,6 +1241,16 @@ - python-jobs - openstack-publish-jobs +- project: + name: marconi-specs + github-org: openstack + node: bare-precise + tarball-site: tarballs.openstack.org + + jobs: + - gate-{name}-python27 + - gate-{name}-docs + - project: name: python-marconiclient github-org: openstack diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index 015fbe2d21..5edb244d8f 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -296,6 +296,9 @@ group: keystone upstream: git://github.com/morganfainberg/keystonemiddleware - project: openstack/marconi +- project: openstack/marconi-specs + group: marconi + upstream: git://github.com/FlaPer87/marconi-specs.git - project: openstack/netconn-api group: openstack-api-site options: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 1716484633..17483dc989 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1004,6 +1004,14 @@ projects: - marconi-tarball - marconi-docs + - name: openstack/marconi-specs + check: + - gate-marconi-specs-python27 + - gate-marconi-specs-docs + gate: + - gate-marconi-specs-python27 + - gate-marconi-specs-docs + - name: openstack/neutron template: - name: python-jobs