cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issue with legacy jenkins instances

Browse source
This commit is contained in:
Artem Loginov 2017-02-07 16:31:21 +00:00 committed by ansibot
parent 6868c892ed
commit 6e8eb7612a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/web_infrastructure/jenkins_job.py
View file

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