summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authormike o'brien <mpobrien005@gmail.com>2014-02-06 18:10:48 -0500
committermike o'brien <mpobrien005@gmail.com>2014-02-06 18:10:48 -0500
commitef817ea8032358b7eb58f953fc3ef203c02fc578 (patch)
treee7b5319fbafe3a1f0807b355cf33d0c8de38c7f5 /buildscripts
parent27fb434eaebc35646cdadf7acac562aa47c06ac8 (diff)
downloadmongo-ef817ea8032358b7eb58f953fc3ef203c02fc578.tar.gz
SERVER-12509 allow overriding default buildlog URL with command line opt to smoke.py
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/buildlogger.py2
-rwxr-xr-xbuildscripts/smoke.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/buildscripts/buildlogger.py b/buildscripts/buildlogger.py
index 924e2d3ee0d..a31b3e2dfa1 100644
--- a/buildscripts/buildlogger.py
+++ b/buildscripts/buildlogger.py
@@ -90,7 +90,7 @@ for path in possible_paths:
pass
-URL_ROOT = 'http://buildlogs.mongodb.org/'
+URL_ROOT = os.environ.get('BUILDLOGGER_URL', 'http://buildlogs.mongodb.org/')
TIMEOUT_SECONDS = 10
socket.setdefaulttimeout(TIMEOUT_SECONDS)
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index bf50966fdd5..ab01c9f6c70 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -1123,6 +1123,8 @@ def main():
action="store", help='Set the "builder name" for buildlogger')
parser.add_option('--buildlogger-buildnum', dest='buildlogger_buildnum', default=None,
action="store", help='Set the "build number" for buildlogger')
+ parser.add_option('--buildlogger-url', dest='buildlogger_url', default=None,
+ action="store", help='Set the url root for the buildlogger service')
parser.add_option('--buildlogger-credentials', dest='buildlogger_credentials', default=None,
action="store", help='Path to Python file containing buildlogger credentials')
parser.add_option('--buildlogger-phase', dest='buildlogger_phase', default=None,
@@ -1151,6 +1153,9 @@ def main():
# some but not all of the required options were sete
raise Exception("you must set all of --buildlogger-builder, --buildlogger-buildnum, --buildlogger-credentials")
+ if options.buildlogger_url: #optional; if None, defaults to const in buildlogger.py
+ os.environ['BUILDLOGGER_URL'] = options.buildlogger_url
+
if options.File:
if options.File == '-':
tests = sys.stdin.readlines()