From 49a29d942817864f491056f6b60bdeec9cb15000 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 8 Nov 2012 11:51:01 +0100 Subject: [PATCH] Reverse the close-pull logic. We have a huge list of projects with all of them listing "close-pull" as an option. Turns out we want to close pull requests for all of them - so instead, let's only indicate 'has-pull-requests' if there is ever a project for whom we do not want to close pull requests. Change-Id: I4db31d324b7f260ea24f538ac5f5fc8e1feca75d Reviewed-on: https://review.openstack.org/15626 Reviewed-by: James E. Blair Reviewed-by: Clark Boylan Reviewed-by: Paul Belanger Reviewed-by: Jeremy Stanley Approved: Monty Taylor Tested-by: Jenkins --- doc/source/gerrit.rst | 5 +- .../gerrit/files/scripts/make_local_repos.py | 2 - .../files/scripts/close_pull_requests.py | 4 +- .../files/review-dev.projects.yaml | 2 - .../files/review.projects.yaml | 128 +----------------- 5 files changed, 6 insertions(+), 135 deletions(-) diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst index 5d85ceb739..7f68e1c9e4 100644 --- a/doc/source/gerrit.rst +++ b/doc/source/gerrit.rst @@ -751,14 +751,11 @@ with instructions to use Gerrit. * Edit openstack/openstack-ci-puppet:modules/openstack_project/files/review.projects.yaml -and add the project to the list of projects in the yaml file with the -'close-pull' option. +and add the project to the list of projects in the yaml file For example:: - project: openstack/PROJECT - options: - - close-pull Adding Local Git Replica ======================== diff --git a/modules/gerrit/files/scripts/make_local_repos.py b/modules/gerrit/files/scripts/make_local_repos.py index f598446168..bb8ab9d899 100755 --- a/modules/gerrit/files/scripts/make_local_repos.py +++ b/modules/gerrit/files/scripts/make_local_repos.py @@ -17,8 +17,6 @@ # It should look like: # - project: PROJECT_NAME -# options: -# - close-pull # remote: https://gerrit.googlesource.com/gerrit # TODO: add support for diff --git a/modules/github/files/scripts/close_pull_requests.py b/modules/github/files/scripts/close_pull_requests.py index 2ab0c64b82..441aab95cb 100755 --- a/modules/github/files/scripts/close_pull_requests.py +++ b/modules/github/files/scripts/close_pull_requests.py @@ -18,7 +18,7 @@ # - project: PROJECT_NAME # options: -# - close-pull +# - has-pull-requests # Github authentication information is read from github.secure.config, # which should look like: @@ -68,7 +68,7 @@ for section in config: project = section['project'] # Make sure we're supposed to close pull requests for this project: - if 'options' not in section or 'close-pull' not in section['options']: + if 'options' in section and 'has-pull-requests' in section['options']: continue # Find the project's repo diff --git a/modules/openstack_project/files/review-dev.projects.yaml b/modules/openstack_project/files/review-dev.projects.yaml index fc52cf0987..c7689b088e 100644 --- a/modules/openstack_project/files/review-dev.projects.yaml +++ b/modules/openstack_project/files/review-dev.projects.yaml @@ -1,3 +1 @@ - project: gtest-org/test - options: - - close-pull diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index 4d1deda7a2..99412e7401 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -1,184 +1,62 @@ - project: heat-api/heat - options: - - close-pull - project: heat-api/python-heatclient - options: - - close-pull - project: openstack-ci/devstack-gate - options: - - close-pull - project: openstack-ci/gerrit - options: - - close-pull remote: https://gerrit.googlesource.com/gerrit - project: openstack-ci/gerrit-verification-status-plugin - options: - - close-pull - project: openstack-ci/gerritbot - options: - - close-pull - project: openstack-ci/gerritlib - options: - - close-pull - project: openstack-ci/git-review - options: - - close-pull - project: openstack-ci/jenkins-job-builder - options: - - close-pull - project: openstack-ci/lodgeit - options: - - close-pull - project: openstack-ci/meetbot - options: - - close-pull - project: openstack-ci/nose-html-output - options: - - close-pull - project: openstack-ci/puppet-apparmor - options: - - close-pull - project: openstack-ci/puppet-dashboard - options: - - close-pull - project: openstack-ci/puppet-vcsrepo - options: - - close-pull - project: openstack-ci/pypi-mirror - options: - - close-pull - project: openstack-ci/zuul - options: - - close-pull - project: openstack-dev/devstack - options: - - close-pull - project: openstack-dev/openstack-nose - options: - - close-pull - project: openstack-dev/openstack-qa - options: - - close-pull - project: openstack-dev/pbr - options: - - close-pull - project: openstack-dev/sandbox - options: - - close-pull - project: openstack/cinder - options: - - close-pull - project: openstack/compute-api - options: - - close-pull - project: openstack/glance - options: - - close-pull - project: openstack/horizon - options: - - close-pull - project: openstack/identity-api - options: - - close-pull - project: openstack/image-api - options: - - close-pull - project: openstack/keystone - options: - - close-pull - project: openstack/melange - options: - - close-pull - project: openstack/netconn-api - options: - - close-pull - project: openstack/nova - options: - - close-pull - project: openstack/object-api - options: - - close-pull - project: openstack/openstack-chef - options: - - close-pull - project: openstack/openstack-ci - options: - - close-pull - project: openstack/openstack-ci-puppet - options: - - close-pull - project: openstack/openstack-common - options: - - close-pull - project: openstack/openstack-manuals - options: - - close-pull - project: openstack/openstack-planet - options: - - close-pull - project: openstack/openstack-puppet - options: - - close-pull - project: openstack/python-cinderclient - options: - - close-pull - project: openstack/python-glanceclient - options: - - close-pull - project: openstack/python-keystoneclient - options: - - close-pull - project: openstack/python-melangeclient - options: - - close-pull - project: openstack/python-novaclient - options: - - close-pull - project: openstack/python-openstackclient - options: - - close-pull - project: openstack/python-quantumclient - options: - - close-pull - project: openstack/python-swiftclient - options: - - close-pull -- project: openstack/requirements - options: - - close-pull - project: openstack/quantum - options: - - close-pull +- project: openstack/requirements - project: openstack/swift - options: - - close-pull - project: openstack/tempest - options: - - close-pull - project: openstack/volume-api - options: - - close-pull - project: stackforge/MRaaS - options: - - close-pull - project: stackforge/ceilometer - options: - - close-pull -- project: stackforge/reddwarf - options: - - close-pull -- project: stackforge/python-reddwarfclient - options: - - close-pull - project: stackforge/libra - options: - - close-pull - project: stackforge/marconi - options: - - close-pull - project: stackforge/moniker - options: - - close-pull - project: stackforge/python-monikerclient - options: - - close-pull +- project: stackforge/python-reddwarfclient +- project: stackforge/reddwarf