Merge global defaults for jobs also
Currently, global defaults are merged to custom defaults for job templates, but not for jobs. Unify this behaviour. Change-Id: I26fb2678df7f4225571bf7c3cd4be7041ce99217
This commit is contained in:
parent
5ebaed2f72
commit
d0b2774f20
|
@ -79,7 +79,7 @@ class RootBase:
|
|||
expanded_desc = self._expander.expand(description, params)
|
||||
return {"description": (expanded_desc or "") + MAGIC_MANAGE_STRING}
|
||||
|
||||
def _pick_defaults(self, name, merge_global=True):
|
||||
def _pick_defaults(self, name):
|
||||
try:
|
||||
defaults = self._defaults[name]
|
||||
except KeyError:
|
||||
|
@ -92,16 +92,13 @@ class RootBase:
|
|||
)
|
||||
if name == "global":
|
||||
return defaults
|
||||
if merge_global:
|
||||
return defaults.merged_with_global(self._pick_defaults("global"))
|
||||
else:
|
||||
return defaults
|
||||
return defaults.merged_with_global(self._pick_defaults("global"))
|
||||
|
||||
|
||||
class NonTemplateRootMixin:
|
||||
def top_level_generate_items(self):
|
||||
try:
|
||||
defaults = self._pick_defaults(self.defaults_name, merge_global=False)
|
||||
defaults = self._pick_defaults(self.defaults_name)
|
||||
item_params = LocDict.merge(
|
||||
defaults.params,
|
||||
self.params,
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<keepDependencies>false</keepDependencies>
|
||||
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
|
||||
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
|
||||
<concurrentBuild>false</concurrentBuild>
|
||||
<concurrentBuild>true</concurrentBuild>
|
||||
<canRoam>true</canRoam>
|
||||
<properties/>
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
|
@ -15,5 +15,7 @@
|
|||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
<publishers/>
|
||||
<buildWrappers/>
|
||||
<buildWrappers>
|
||||
<hudson.plugins.timestamper.TimestamperBuildWrapper/>
|
||||
</buildWrappers>
|
||||
</project>
|
||||
|
|
Loading…
Reference in New Issue