jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "Fix update after deleting all jobs"

Browse Source
This commit is contained in:
Jenkins 2015-10-12 17:20:02 +00:00 committed by Gerrit Code Review
commit 4672157c05
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins_jobs/builder.py
View File

@ -72,6 +72,9 @@ class CacheStorage(object):
def set(self, job, md5): def set(self, job, md5):
self.data[job] = md5 self.data[job] = md5
def clear(self):
self.data.clear()
def is_cached(self, job): def is_cached(self, job):
if job in self.data: if job in self.data:
return True return True
@ -298,6 +301,8 @@ class Builder(object):
jobs = self.jenkins.get_jobs() jobs = self.jenkins.get_jobs()
logger.info("Number of jobs to delete: %d", len(jobs)) logger.info("Number of jobs to delete: %d", len(jobs))
self.jenkins.delete_all_jobs() self.jenkins.delete_all_jobs()
# Need to clear the JJB cache after deletion
self.cache.clear()
def update_job(self, input_fn, jobs_glob=None, output=None): def update_job(self, input_fn, jobs_glob=None, output=None):
self.load_files(input_fn) self.load_files(input_fn)