From 0b82c37af5f8d12eaf51980b14e3f74a66c990b0 Mon Sep 17 00:00:00 2001 From: Mathew Odden Date: Tue, 30 Jul 2013 20:07:59 -0500 Subject: [PATCH] Create new pypi-mirror project for run_mirror.py In preparation to split the run_mirror.py script into a different project from jeepyb, we need to create the new home for the run_mirror.py script. Change-Id: I1dd467afe8ef6a153d8a5f0fc95707c864861f9c --- .../gerritbot/files/gerritbot_channel_config.yaml | 1 + .../gerrit/acls/openstack-infra/pypi-mirror.config | 12 ++++++++++++ .../files/jenkins_job_builder/config/projects.yaml | 12 ++++++++++++ modules/openstack_project/files/zuul/layout.yaml | 14 ++++++++++++++ .../templates/review.projects.yaml.erb | 3 +++ 5 files changed, 42 insertions(+) create mode 100644 modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 35ddd4c3f1..10612c7fd0 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -28,6 +28,7 @@ openstack-infra: - openstack-infra/puppet-apparmor - openstack-infra/puppet-dashboard - openstack-infra/puppet-vcsrepo + - openstack-infra/pypi-mirror - openstack-infra/releasestatus - openstack-infra/reviewday - openstack-infra/reviewstats diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config new file mode 100644 index 0000000000..852d60c5ef --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config @@ -0,0 +1,12 @@ +[access "refs/heads/*"] + label-Approved = +0..+1 group openstack-ci-core + label-Code-Review = -2..+2 group openstack-ci-core +[access "refs/tags/*"] + create = group openstack-ci-core + pushTag = group openstack-ci-core +[project] + state = active +[receive] + requireChangeId = 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 fbfa721a36..37bfdcc71d 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -247,6 +247,18 @@ - pypi-jobs +- project: + name: pypi-mirror + github-org: openstack-infra + node: precise + tarball-site: tarballs.openstack.org + + jobs: + - gate-{name}-pep8 + - '{name}-tarball' + - pypi-jobs + + - project: name: gear github-org: openstack-infra diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index d1a2a96fbc..ca46413096 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -366,6 +366,20 @@ projects: - post-mirror-python27 - post-mirror-python33 + - name: openstack-infra/pypi-mirror + check: + - gate-pypi-mirror-pep8 + gate: + - gate-pypi-mirror-pep8 + pre-release: + - pypi-mirror-tarball + release: + - pypi-mirror-tarball: + - pypi-mirror-pypi-upload: + - post-mirror-python26 + - post-mirror-python27 + - post-mirror-python33 + - name: openstack-infra/jenkins-job-builder check: - gate-jenkins-job-builder-docs diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb index 01d8925fa4..c0188ce390 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -30,6 +30,9 @@ - project: openstack-infra/jeepyb upstream: git://github.com/emonty/gerritx.git description: Gerrit Project Builder Tools +- project: openstack-infra/pypi-mirror + upstream: git://github.com/openstack-infra/jeepyb.git + description: PyPI mirror builder - project: openstack-infra/gitdm description: A fork of Jonathan Corbet's gitdm for OpenStack upstream: git://github.com/markmc/openstack-gitdm.git