From 44d9368d3fff07485a2b60d0892ae6cad7512a17 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Fri, 5 Jun 2020 13:52:31 -0500 Subject: [PATCH] Don't override cascade if it already exists. --- ci/jobgenerator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/jobgenerator.py b/ci/jobgenerator.py index 2fa3e24..9654a12 100755 --- a/ci/jobgenerator.py +++ b/ci/jobgenerator.py @@ -272,7 +272,8 @@ class Generator: config = configs["merger"][config] parent = metadata["active_configs"][config["default"]["parent"]] for package in parent["repositories"]: - package["cascade"] = config["default"]["cascade"] + if "cascade" not in package: + package["cascade"] = config["default"]["cascade"] name = config_name + "_" + package["name"] p_config = self.load_config("merger", package) self.create_jenkins_job(server, p_config, name, "merger")