From aa420cd247870f99a1341af220281e85c2354fab Mon Sep 17 00:00:00 2001 From: salimfadhley Date: Sat, 15 Jun 2013 00:29:01 +0100 Subject: [PATCH] build fixes --- examples/get_config.py | 11 +++++++++++ jenkinsapi_utils/jenkins_launcher.py | 10 +++------- 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 examples/get_config.py diff --git a/examples/get_config.py b/examples/get_config.py new file mode 100644 index 0000000..37474df --- /dev/null +++ b/examples/get_config.py @@ -0,0 +1,11 @@ +import logging +logging.basicConfig() + +from jenkinsapi.jenkins import Jenkins +J = Jenkins('http://localhost:8080') +jobName = 'create_fwrgmkbbzk' + +config = J[jobName].get_config() + +print config + diff --git a/jenkinsapi_utils/jenkins_launcher.py b/jenkinsapi_utils/jenkins_launcher.py index 3b3c341..aab1fba 100644 --- a/jenkinsapi_utils/jenkins_launcher.py +++ b/jenkinsapi_utils/jenkins_launcher.py @@ -54,13 +54,6 @@ class JenkinsLancher(object): self.q = Queue.Queue() def update_war(self): - if not os.path.exists(self.war_path): - with io.open(self.war_path, 'wb') as war_file: - log.info("Downloading the Jenkins WAR file") - war_response = requests.get(self.JENKINS_WAR_URL) - war_file.write(war_response.text) - log.info('Done!') - os.chdir(self.war_directory) subprocess.check_call('./get-jenkins-war.sh') @@ -104,6 +97,9 @@ class JenkinsLancher(object): if 'Failed to initialize Jenkins' in line: raise FailedToStart(line) + if 'Invalid or corrupt jarfile' in line: + raise FailedToStart(line) + if 'is fully up and running' in line: log.info(line) return -- 2.7.4