From f4619276d5e3443c192da7027ecb28cead3aeeed Mon Sep 17 00:00:00 2001 From: "Michal (inc0) Jastrzebski" Date: Thu, 17 Nov 2016 18:17:50 +0000 Subject: [PATCH] Add puppet-docker_registry project Create new docker module for docker registry in infra regions Needed-by: I014ed96cfee2a12d5d6a789b569c1292399c1c0a Change-Id: Ide1c1f711a78537d13897574e9d27c4d177eb393 --- .../openstack-infra/puppet-docker_registry.config | 13 +++++++++++++ gerrit/projects.yaml | 5 +++++ gerritbot/channels.yaml | 2 ++ jenkins/jobs/projects.yaml | 13 +++++++++++++ zuul/layout.yaml | 7 +++++++ 5 files changed, 40 insertions(+) create mode 100644 gerrit/acls/openstack-infra/puppet-docker_registry.config diff --git a/gerrit/acls/openstack-infra/puppet-docker_registry.config b/gerrit/acls/openstack-infra/puppet-docker_registry.config new file mode 100644 index 0000000000..7164eb6ca7 --- /dev/null +++ b/gerrit/acls/openstack-infra/puppet-docker_registry.config @@ -0,0 +1,13 @@ +[access "refs/heads/*"] +abandon = group puppet-docker_registry-core +label-Code-Review = -2..+2 group puppet-docker_registry-core +label-Workflow = -1..+1 group puppet-docker_registry-core + +[access "refs/tags/*"] +pushSignedTag = group puppet-docker_registry-release + +[receive] +requireChangeId = true + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 92d4c98423..c897f76d31 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -338,6 +338,11 @@ groups: - openstack-ci description: Puppet module to install diskimage-builder and its depends +- project: openstack-infra/puppet-docker_registry + use-storyboard: true + groups: + - openstack-ci + description: Puppet module to setup standalone docker registry - project: openstack-infra/puppet-drupal use-storyboard: true description: Puppet module for groups drupal portal diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index f327db6657..417b32f4ef 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -824,6 +824,7 @@ openstack-infra: - openstack-infra/puppet-ciwatch - openstack-infra/puppet-dashboard - openstack-infra/puppet-diskimage_builder + - openstack-infra/puppet-docker_registry - openstack-infra/puppet-drupal - openstack-infra/puppet-elastic_recheck - openstack-infra/puppet-elasticsearch @@ -1167,6 +1168,7 @@ openstack-merges: - openstack-infra/puppet-ciwatch - openstack-infra/puppet-dashboard - openstack-infra/puppet-diskimage_builder + - openstack-infra/puppet-docker_registry - openstack-infra/puppet-drupal - openstack-infra/puppet-elastic_recheck - openstack-infra/puppet-elasticsearch diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 8e36079827..cd27d82349 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -10421,6 +10421,19 @@ job-suffix: '' branch-override: default +- project: + name: puppet-docker_registry + tarball-site: tarballs.openstack.org + + jobs: + - puppet-check-jobs + - puppet-beaker-jobs-trusty: + job-suffix: '' + branch-override: default + - puppet-beaker-jobs-centos7: + job-suffix: '' + branch-override: default + - project: name: puppet-drupal tarball-site: tarballs.openstack.org diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4c8bc9302e..e76c98e3a0 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -4363,6 +4363,13 @@ projects: - name: infra-puppet-apply-jobs - name: puppet-beaker-jobs + - name: openstack-infra/puppet-docker_registry + template: + - name: merge-check + - name: infra-puppet-check-jobs + - name: infra-puppet-apply-jobs + - name: puppet-beaker-jobs + - name: openstack-infra/puppet-drupal template: - name: merge-check