diff --git a/gerrit/acls/openstack-infra/puppet-infracloud.config b/gerrit/acls/openstack-infra/puppet-infracloud.config new file mode 100644 index 0000000000..b40167b16a --- /dev/null +++ b/gerrit/acls/openstack-infra/puppet-infracloud.config @@ -0,0 +1,13 @@ +[access "refs/heads/*"] +abandon = group puppet-infracloud-core +label-Code-Review = -2..+2 group puppet-infracloud-core +label-Workflow = -1..+1 group puppet-infracloud-core + +[access "refs/tags/*"] +pushSignedTag = group puppet-infracloud-release + +[receive] +requireChangeId = true + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index b2ba15967a..3ca6b8fdec 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -382,6 +382,11 @@ description: Cookiecutter template for compliant OpenStack-infra puppet-modules groups: - openstack-ci +- project: openstack-infra/puppet-infracloud + use-storyboard: true + description: Puppet module for deploying the Infra Cloud + groups: + - openstack-ci - project: openstack-infra/puppet-iptables use-storyboard: true description: Puppet module for iptables diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index e16b098a40..6ebc9dc4f1 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -643,6 +643,7 @@ openstack-infra: - openstack-infra/puppet-hound - openstack-infra/puppet-httpd - openstack-infra/puppet-infra-cookiecutter + - openstack-infra/puppet-infracloud - openstack-infra/puppet-iptables - openstack-infra/puppet-jeepyb - openstack-infra/puppet-jenkins @@ -948,6 +949,7 @@ openstack-merges: - openstack-infra/puppet-haveged - openstack-infra/puppet-hound - openstack-infra/puppet-httpd + - openstack-infra/puppet-infracloud - openstack-infra/puppet-iptables - openstack-infra/puppet-jeepyb - openstack-infra/puppet-jenkins diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index a995ef1e5b..14a2a55f6b 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -4190,6 +4190,17 @@ branch-designator: '-nv' branch-override: default +- project: + name: puppet-infracloud + node: 'bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - puppet-check-jobs + - puppet-beaker-jobs: + branch-designator: '-nv' + branch-override: default + - project: name: puppet-iptables node: 'bare-trusty' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 1676ead6e1..090c292671 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6243,6 +6243,13 @@ projects: - name: merge-check - name: noop-jobs + - name: openstack-infra/puppet-infracloud + template: + - name: merge-check + - name: infra-puppet-check-jobs + - name: infra-puppet-apply-jobs + - name: puppet-beaker-jobs-nv + - name: openstack-infra/puppet-iptables template: - name: merge-check