return EXCL_STATE when color property is not in the response

pull/27789/merge
Sergio Millan 8 years ago committed by ansibot
parent 6e8eb7612a
commit 400085aa5b

@ -190,9 +190,6 @@ class JenkinsJob:
} }
} }
# This kind of jobs do not have a property that makes them enabled/disabled
self.job_classes_exceptions = ["jenkins.branch.OrganizationFolder","com.cloudbees.hudson.plugins.folder.Folder"]
self.EXCL_STATE = "excluded state" self.EXCL_STATE = "excluded state"
def get_jenkins_connection(self): def get_jenkins_connection(self):
@ -208,14 +205,10 @@ class JenkinsJob:
except Exception as e: except Exception as e:
self.module.fail_json(msg='Unable to connect to Jenkins server, %s' % to_native(e), exception=traceback.format_exc()) self.module.fail_json(msg='Unable to connect to Jenkins server, %s' % to_native(e), exception=traceback.format_exc())
def job_class_excluded(self, check_class):
return check_class in self.job_classes_exceptions
def get_job_status(self): def get_job_status(self):
try: try:
check_class = ET.fromstring(self.get_current_config()).tag
response = self.server.get_job_info(self.name) response = self.server.get_job_info(self.name)
if self.job_class_excluded(check_class): if "color" not in response:
return self.EXCL_STATE return self.EXCL_STATE
else: else:
return response['color'].encode('utf-8') return response['color'].encode('utf-8')

Loading…
Cancel
Save