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

Fixing Issue#18995

Browse source
This commit is contained in:
Sergio Millan 2016-12-22 17:57:49 +00:00 committed by Toshio Kuratomi
parent f129977e2b
commit 08b671990d
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,6 +188,11 @@ class JenkinsJob:
} }
} }
# This kind of jobs do not have a property that makes them enabled/disabled
self.job_classes_exceptions = ["jenkins.branch.OrganizationFolder"]
self.EXCL_STATE = "excluded state"
def get_jenkins_connection(self): def get_jenkins_connection(self):
try: try:
if (self.user and self.password): if (self.user and self.password):
@ -202,9 +207,17 @@ class JenkinsJob:
e = get_exception() e = get_exception()
self.module.fail_json(msg='Unable to connect to Jenkins server, %s' % str(e)) self.module.fail_json(msg='Unable to connect to Jenkins server, %s' % str(e))
def job_class_excluded(self, response):
return response['_class'] in self.job_classes_exceptions
def get_job_status(self): def get_job_status(self):
try: try:
return self.server.get_job_info(self.name)['color'].encode('utf-8') response = self.server.get_job_info(self.name)
if self.job_class_excluded(response):
return self.EXCL_STATE
else:
return response['color'].encode('utf-8')
except Exception: except Exception:
e = get_exception() e = get_exception()
self.module.fail_json(msg='Unable to fetch job information, %s' % str(e)) self.module.fail_json(msg='Unable to fetch job information, %s' % str(e))
@ -272,7 +285,7 @@ class JenkinsJob:
self.server.reconfig_job(self.name, self.get_config()) self.server.reconfig_job(self.name, self.get_config())
# Handle job disable/enable # Handle job disable/enable
elif self.has_state_changed(status): elif (status != self.EXCL_STATE and self.has_state_changed(status)):
self.result['changed'] = True self.result['changed'] = True
if not self.module.check_mode: if not self.module.check_mode:
self.switch_state() self.switch_state()