diff options
| author | Darragh Bailey <dbailey@hpe.com> | 2015-09-21 15:36:10 +0100 |
|---|---|---|
| committer | Darragh Bailey <dbailey@hpe.com> | 2015-09-29 18:57:00 +0100 |
| commit | 647bbdb7fcde2106151a02f3645fb7bea4540196 (patch) | |
| tree | 19b82077015a06325f8f19a50e96272dfaab7116 /jenkins_jobs/builder.py | |
| parent | b8eb60239f7eaf6f5a19624b95aea4baaaadc5e8 (diff) | |
| download | python-jenkins-job-builder-647bbdb7fcde2106151a02f3645fb7bea4540196.tar.gz python-jenkins-job-builder-647bbdb7fcde2106151a02f3645fb7bea4540196.tar.xz python-jenkins-job-builder-647bbdb7fcde2106151a02f3645fb7bea4540196.zip | |
Distinguish kept jobs and unmanaged jobs when skipping removal
Distinguish between ignoring kept managed jobs and unmanaged jobs when
deleting old jobs from the master.
Change-Id: I41e809a775ec9d07863b7c532c98f2eac4c8e5bf
Diffstat (limited to 'jenkins_jobs/builder.py')
| -rw-r--r-- | jenkins_jobs/builder.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/jenkins_jobs/builder.py b/jenkins_jobs/builder.py index 2eae8185..1d17e882 100644 --- a/jenkins_jobs/builder.py +++ b/jenkins_jobs/builder.py @@ -257,15 +257,17 @@ class Builder(object): if keep is None: keep = [job.name for job in self.parser.xml_jobs] for job in jobs: - if job['name'] not in keep and \ - self.jenkins.is_managed(job['name']): - logger.info("Removing obsolete jenkins job {0}" - .format(job['name'])) - self.delete_job(job['name']) - deleted_jobs += 1 + if job['name'] not in keep: + if self.jenkins.is_managed(job['name']): + logger.info("Removing obsolete jenkins job {0}" + .format(job['name'])) + self.delete_job(job['name']) + deleted_jobs += 1 + else: + logger.info("Not deleting unmanaged jenkins job %s", + job['name']) else: - logger.debug("Ignoring unmanaged jenkins job %s", - job['name']) + logger.debug("Keeping job %s", job['name']) return deleted_jobs def delete_job(self, jobs_glob, fn=None): |