diff options
| author | Zuul <zuul@review.opendev.org> | 2020-05-27 18:00:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-05-27 18:00:50 +0000 |
| commit | 6161ad75a83cd8e8c3bd347ea7f40b0e2d6b5c33 (patch) | |
| tree | af999c0a19b34c7ee0f4786eb66c72c7a719263d | |
| parent | 03a3610924cc124063b47ca1c47d265a5a8e47a0 (diff) | |
| parent | 12961dd04a57ed3f8ee31abf0437cc5b292ab445 (diff) | |
| download | zuul-6161ad75a83cd8e8c3bd347ea7f40b0e2d6b5c33.tar.gz | |
Merge "Include extra, host, and group variables in job serialization"3.19.0
| -rw-r--r-- | tests/unit/test_web.py | 24 | ||||
| -rw-r--r-- | zuul/model.py | 3 |
2 files changed, 27 insertions, 0 deletions
diff --git a/tests/unit/test_web.py b/tests/unit/test_web.py index 381d4585a..184a4b0ac 100644 --- a/tests/unit/test_web.py +++ b/tests/unit/test_web.py @@ -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} ]], diff --git a/zuul/model.py b/zuul/model.py index a1e3d3dc4..377b4ba40 100644 --- a/zuul/model.py +++ b/zuul/model.py @@ -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 |