Include extra, host, and group variables in job serialization

This serialization is used by the REST API as well as configuration
change detection.  Including these variables allows API users to
see a more complete picture of the job as well as corrects a
malfunction in the job config change detection (a change to a job
with file matcher's host-vars, for example, would not trigger running
the job).

Change-Id: I27b5fd81fc0c90bd13ead6ecdef0a5d3dbcc2e57
This commit is contained in:
James E. Blair 2020-05-20 13:13:36 -07:00
parent 5b3ee2d8b4
commit 12961dd04a
2 changed files with 27 additions and 0 deletions

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}
]],

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