From 55f157a0f249e92113f4c1cd2c828aa0e54043fc Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sat, 13 Apr 2019 15:39:03 -0500 Subject: [PATCH] Bring the management job creation outside the scope of the main loop. --- ci/jobgenerator.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ci/jobgenerator.py b/ci/jobgenerator.py index 063fa4d..17775f0 100755 --- a/ci/jobgenerator.py +++ b/ci/jobgenerator.py @@ -181,6 +181,8 @@ class Generator: for job_name, job_instance in server.get_jobs(): jobs.append(job_name) + total_rel = set() + for package in metadata: # Create the merger jobs first job_name = "merger_" + package["name"] @@ -197,8 +199,6 @@ class Generator: view = server.views.create("merger") view.add_job(job_name) - total_rel = set() - for release in package["releases"]: # Add the release to the total release set, which is used to # generate the management jobs @@ -224,22 +224,22 @@ class Generator: view.add_job(job_name) - # Generate a management job for every release, stable and unstable - for release in total_rel: - for jobtype in ["unstable", "stable"]: - package_config = self.load_config("release-mgmt") - jobname = "mgmt_build_" + release + "_" + jobtype - if job_name in jobs: - job = server.get_job(job_name) - job.update_config(package_config) - else: - job = server.create_job(job_name, str(package_config)) + # Generate a management job for every release, stable and unstable + for release in total_rel: + for jobtype in ["unstable", "stable"]: + package_config = self.load_config("release-mgmt") + jobname = "mgmt_build_" + release + "_" + jobtype + if job_name in jobs: + job = server.get_job(job_name) + job.update_config(package_config) + else: + job = server.create_job(job_name, str(package_config)) - # The mgmt view should be the first view created, we don't - # have to create it if it doesn't exist because that's a - # Huge Problem anyway - view = server.views["mgmt"] - view.add_job(jobname) + # The mgmt view should be the first view created, we don't + # have to create it if it doesn't exist because that's a + # Huge Problem anyway + view = server.views["mgmt"] + view.add_job(jobname) if __name__ == "__main__":