jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "Delete old managed folders when calling update subcommand with --delete-old option"

This commit is contained in:
Zuul 2018-04-12 19:08:55 +00:00 committed by Gerrit Code Review
parent b72235c462 e0f19f39cd
commit d0b438cf25
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jenkins_jobs/builder.py
View File

@ -132,12 +132,11 @@ class JenkinsManager(object):
self._job_format(job_name)))
self.jenkins.create_job(job_name, xml)
def is_job(self, job_name):
# first use cache
if job_name in self.job_list:
return True
def is_job(self, job_name, use_cache=True):
if use_cache:
if job_name in self.job_list:
return True
# if not exists, use jenkins
return self.jenkins.job_exists(job_name)
def get_job_md5(self, job_name):
@ -200,7 +199,9 @@ class JenkinsManager(object):
keep = []
for job in jobs:
# python-jenkins stores the folder and name as 'fullname'
if job['fullname'] not in keep:
# Check if the job was deleted when his parent folder was deleted
if job['fullname'] not in keep and \
self.is_job(job['fullname'], use_cache=False):
if self.is_managed(job['fullname']):
logger.info("Removing obsolete jenkins job {0}"
.format(job['fullname']))

2
tests/jenkins_manager/test_manager.py
View File

@ -60,11 +60,13 @@ class TestCaseTestJenkinsManager(base.BaseTestCase):
with mock.patch.multiple('jenkins_jobs.builder.JenkinsManager',
get_jobs=mock.DEFAULT,
is_job=mock.DEFAULT,
is_managed=mock.DEFAULT,
delete_job=mock.DEFAULT) as patches:
patches['get_jobs'].return_value = [{'fullname': 'job1'},
{'fullname': 'job2'}]
patches['is_managed'].side_effect = [True, True]
patches['is_job'].side_effect = [True, True]
self.builder.delete_old_managed()
self.assertEqual(patches['delete_job'].call_count, 2)