From babd3a54297d8bf5a6fb5c6455ce6e7b48ee0931 Mon Sep 17 00:00:00 2001 From: "James E. Blair" <jeblair@linux.vnet.ibm.com> Date: Tue, 15 Sep 2015 14:49:32 -0700 Subject: [PATCH] Add puppet-odsreg project Change-Id: I84e355bf84366431888e751f271cbc8a6f313ed3 --- gerrit/acls/openstack-infra/puppet-odsreg.config | 13 +++++++++++++ gerrit/projects.yaml | 5 +++++ gerritbot/channels.yaml | 2 ++ jenkins/jobs/projects.yaml | 11 +++++++++++ zuul/layout.yaml | 7 +++++++ 5 files changed, 38 insertions(+) create mode 100644 gerrit/acls/openstack-infra/puppet-odsreg.config diff --git a/gerrit/acls/openstack-infra/puppet-odsreg.config b/gerrit/acls/openstack-infra/puppet-odsreg.config new file mode 100644 index 0000000000..a691a3eaab --- /dev/null +++ b/gerrit/acls/openstack-infra/puppet-odsreg.config @@ -0,0 +1,13 @@ +[access "refs/heads/*"] +abandon = group puppet-odsreg-core +label-Code-Review = -2..+2 group puppet-odsreg-core +label-Workflow = -1..+1 group puppet-odsreg-core + +[access "refs/tags/*"] +pushSignedTag = group puppet-odsreg-release + +[receive] +requireChangeId = true + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 7d0e02bb1f..32e98a8458 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -452,6 +452,11 @@ description: Puppet module for Nodepool groups: - openstack-ci +- project: openstack-infra/puppet-odsreg + use-storyboard: true + description: Puppet module for odsreg + groups: + - openstack-ci - project: openstack-infra/puppet-openafs use-storyboard: true description: Puppet module for OpenAFS diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 0d7efc3b2b..787ae5a7f2 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -665,6 +665,7 @@ openstack-infra: - openstack-infra/puppet-meetbot - openstack-infra/puppet-mysql_backup - openstack-infra/puppet-nodepool + - openstack-infra/puppet-odsreg - openstack-infra/puppet-openafs - openstack-infra/puppet-openstackci - openstack-infra/puppet-openstackid @@ -969,6 +970,7 @@ openstack-merges: - openstack-infra/puppet-meetbot - openstack-infra/puppet-mysql_backup - openstack-infra/puppet-nodepool + - openstack-infra/puppet-odsreg - openstack-infra/puppet-openafs - openstack-infra/puppet-openstackci - openstack-infra/puppet-openstackid diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 1a595788d0..6573e2587b 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -4271,6 +4271,17 @@ branch-designator: '-nv' branch-override: default +- project: + name: puppet-odsreg + node: 'bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - puppet-check-jobs + - puppet-beaker-jobs: + branch-designator: '-nv' + branch-override: default + - project: name: puppet-openafs node: 'bare-trusty' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 585ac4d6f5..7a46f007ce 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6316,6 +6316,13 @@ projects: - name: infra-puppet-apply-jobs - name: puppet-beaker-jobs-nv + - name: openstack-infra/puppet-odsreg + template: + - name: merge-check + - name: infra-puppet-check-jobs + - name: infra-puppet-apply-jobs + - name: puppet-beaker-jobs-nv + - name: openstack-infra/puppet-openafs template: - name: merge-check