Merge "Handle projects not using stable/ branch names"
diff --git a/jeepyb/cmd/close_pull_requests.py b/jeepyb/cmd/close_pull_requests.py
index c1b6a1f..b49bac3 100644
--- a/jeepyb/cmd/close_pull_requests.py
+++ b/jeepyb/cmd/close_pull_requests.py
@@ -38,6 +38,7 @@
# [github]
# oauth_token = GITHUB_OAUTH_TOKEN
+import argparse
import ConfigParser
import github
import logging
@@ -64,6 +65,22 @@
format='%(asctime)-6s: %(name)s - %(levelname)s'
' - %(message)s')
+ parser = argparse.ArgumentParser()
+ parser.add_argument('--message-file', dest='message_file', default=None,
+ help='The close pull request message')
+
+ args = parser.parse_args()
+
+ if args.message_file:
+ try:
+ with open(args.message_file, 'r') as _file:
+ pull_request_text = _file.read()
+ except (OSError, IOError):
+ log.exception("Could not open close pull request message file")
+ raise
+ else:
+ pull_request_text = MESSAGE
+
GITHUB_SECURE_CONFIG = os.environ.get('GITHUB_SECURE_CONFIG',
'/etc/github/github.secure.config')
@@ -113,7 +130,7 @@
headers={},
attributes=issue_data,
completed=True)
- issue.create_comment(MESSAGE % vars)
+ issue.create_comment(pull_request_text % vars)
req.edit(state="closed")
if __name__ == "__main__":
diff --git a/jeepyb/cmd/manage_projects.py b/jeepyb/cmd/manage_projects.py
index 92c7928..0e73585 100644
--- a/jeepyb/cmd/manage_projects.py
+++ b/jeepyb/cmd/manage_projects.py
@@ -588,6 +588,8 @@
continue
try:
+ log.info("Processing project: %s" % project)
+
# Figure out all of the options
options = section.get('options', dict())
description = section.get('description', None)
diff --git a/jeepyb/cmd/welcome_message.py b/jeepyb/cmd/welcome_message.py
index f4dbdf6..4c78f52 100644
--- a/jeepyb/cmd/welcome_message.py
+++ b/jeepyb/cmd/welcome_message.py
@@ -79,12 +79,13 @@
and resubmit a new change-set.
Patches usually take 3 to 7 days to be reviewed so be patient and be
- available on IRC to ask and answer questions about your work. The more you
- participate in the community the more rewarding it is for you. You may also
- notice that the more you get to know people and get to be known, the faster
- your patches will be reviewed and eventually approved. Get to know others
- and become known by doing code reviews: anybody can do it, and it's a
- great way to learn the code base.
+ available on IRC to ask and answer questions about your work. Also it
+ takes generally at least a couple of weeks for cores to get around to
+ reviewing code. The more you participate in the community the more
+ rewarding it is for you. You may also notice that the more you get to know
+ people and get to be known, the faster your patches will be reviewed and
+ eventually approved. Get to know others and become known by doing code
+ reviews: anybody can do it, and it's a great way to learn the code base.
Thanks again for supporting OpenStack, we look forward to working with you.
diff --git a/setup.cfg b/setup.cfg
index a2a775d..12e056e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@
README.rst
author = OpenStack Infrastructure Team
author-email = openstack-infra@lists.openstack.org
-home-page = http://ci.openstack.org/
+home-page = http://docs.openstack.org/infra/system-config/
classifier =
Intended Audience :: Information Technology
Intended Audience :: System Administrators