zuul
/
zuul
Code Issues Proposed changes

Merge "Include extra, host, and group variables in job serialization"

This commit is contained in:
Zuul 2020-05-27 18:00:50 +00:00 committed by Gerrit Code Review
parent 03a3610924 12961dd04a
commit c12f3fe1de
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/unit/test_web.py
View File

@ -365,6 +365,9 @@ class TestWeb(BaseTestWeb):
'tags': [],
'timeout': None,
'variables': {},
'extra_variables': {},
'group_variables': {},
'host_variables': {},
'variant_description': '',
'voting': True
}, {
@ -406,6 +409,9 @@ class TestWeb(BaseTestWeb):
'tags': [],
'timeout': None,
'variables': {},
'extra_variables': {},
'group_variables': {},
'host_variables': {},
'variant_description': 'stable',
'voting': True
}], data)
@ -445,6 +451,9 @@ class TestWeb(BaseTestWeb):
'tags': [],
'timeout': None,
'variables': {},
'extra_variables': {},
'group_variables': {},
'host_variables': {},
'variant_description': '',
'voting': True
}], data)
@ -563,6 +572,9 @@ class TestWeb(BaseTestWeb):
'tags': [],
'timeout': None,
'variables': {},
'extra_variables': {},
'group_variables': {},
'host_variables': {},
'variant_description': '',
'voting': True}],
[{'abstract': False,
@ -597,6 +609,9 @@ class TestWeb(BaseTestWeb):
'tags': [],
'timeout': None,
'variables': {},
'extra_variables': {},
'group_variables': {},
'host_variables': {},
'variant_description': '',
'voting': True}],
[{'abstract': False,
@ -631,6 +646,9 @@ class TestWeb(BaseTestWeb):
'tags': [],
'timeout': None,
'variables': {},
'extra_variables': {},
'group_variables': {},
'host_variables': {},
'variant_description': '',
'voting': True}],
[{'abstract': False,
@ -665,6 +683,9 @@ class TestWeb(BaseTestWeb):
'tags': [],
'timeout': None,
'variables': {},
'extra_variables': {},
'group_variables': {},
'host_variables': {},
'variant_description': '',
'voting': True}]]
@ -718,6 +739,9 @@ class TestWeb(BaseTestWeb):
'tags': [],
'timeout': None,
'variables': {},
'extra_variables': {},
'group_variables': {},
'host_variables': {},
'variant_description': '',
'voting': True}
]],

3
zuul/model.py
View File

@ -1261,6 +1261,9 @@ class Job(ConfigObject):
else:
d['semaphore'] = None
d['variables'] = self.variables
d['extra_variables'] = self.extra_variables
d['host_variables'] = self.host_variables
d['group_variables'] = self.group_variables
d['final'] = self.final
d['abstract'] = self.abstract
d['protected'] = self.protected