diff options
author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2013-08-29 17:07:20 +0300 |
---|---|---|
committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2013-08-29 17:07:20 +0300 |
commit | b0075e6e415275e292547878562d153edcacedfc (patch) | |
tree | 5751f15864c7fa2fce5c063f903de9d38d3d2976 /utils | |
parent | 7bdc174cf33f59a1fd270b276b2b8977cec6c766 (diff) |
PEP8 fixes.
Diffstat (limited to 'utils')
-rwxr-xr-x | utils/cmdline-client/android-build-client | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/utils/cmdline-client/android-build-client b/utils/cmdline-client/android-build-client index 512ef74..cd1f9b8 100755 --- a/utils/cmdline-client/android-build-client +++ b/utils/cmdline-client/android-build-client @@ -8,13 +8,9 @@ ############################################################################### import base64 -from contextlib import nested import json import os import sys -import copy -import re -from tempfile import NamedTemporaryFile import urllib2 import optparse import getpass @@ -30,6 +26,7 @@ PRIVATE_ACL = """\ </hudson.security.AuthorizationMatrixProperty> """ + class Jenkins(object): def __init__(self, base_url, username, passwd): @@ -42,8 +39,8 @@ class Jenkins(object): def jenkins_rest(self, jenkins_path, data=None, extra_headers=None): """Make an authenticated request to jenkins. - @param jenkins_path: The path on the Jenkins instance to make the request - to. + @param jenkins_path: The path on the Jenkins instance to make the + request to. @param data: Data to include in the request (if this is not None the request will be a POST). @param extra_headers: A dictionary of extra headers that will passed in @@ -84,7 +81,8 @@ class Jenkins(object): return self.jenkins_rest('job/' + job_name + '/config.xml') def post_config(self, url, config_xml): - return self.jenkins_rest_post(url, config_xml, {'Content-Type': 'text/xml'}) + return self.jenkins_rest_post(url, config_xml, + {'Content-Type': 'text/xml'}) def set_job_config(self, job_name, config_xml): return self.post_config('job/' + job_name + '/config.xml', config_xml) @@ -93,29 +91,35 @@ class Jenkins(object): return self.post_config('createItem?name=' + job_name, config_xml) def build_job(self, job_name): - self.jenkins_rest_post('job/' + job_name + '/buildWithParameters?delay=0sec', '') + self.jenkins_rest_post( + 'job/' + job_name + '/buildWithParameters?delay=0sec', '') + def job2user_group(job_group): if job_group == "linaro-android": return "linaro-android-builders" return job_group + def error(msg): print msg sys.exit(1) + def main(): global options optparser = optparse.OptionParser(usage="%prog <cmd> <args>...") - optparser.add_option("--url", default="https://android-build.linaro.org/jenkins", - help="Jenkins base url, default: %default") + optparser.add_option("--url", + default="https://android-build.linaro.org/jenkins", + help="Jenkins base url, default: %default") optparser.add_option("--user", help="Jenkins username, default: $USER") optparser.add_option("--apikey-file", metavar="FILE", help="File holding Jenkins API key") optparser.add_option("--cred-file", metavar="FILE", help="File holding Jenkins username:API key pair") - optparser.add_option("--private", metavar="GROUP", help="Create privaet job accessible to GROUP") + optparser.add_option("--private", metavar="GROUP", + help="Create privaet job accessible to GROUP") options, args = optparser.parse_args(sys.argv[1:]) if len(args) < 1: @@ -179,7 +183,7 @@ def main(): jenkins_job = args[1].replace("/", "_") try: j.create_job(jenkins_job, job_conf) - except urllib2.HTTPError, e: + except urllib2.HTTPError: error("Error creating job '%s' (job exists?)" % jenkins_job) print "Job created successfully: %s/job/%s/" % (options.url, jenkins_job) elif args[0] == "build": |