zuul/zuul
Code Issues Proposed changes

Merge "Add job.override-checkout to rest api"

Browse Source
This commit is contained in:
Zuul
2020-01-23 20:23:33 +00:00
committed by Gerrit Code Review
parent 29c0ba4099 252ae3dcd2
commit 77460f11e9
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/test_web.py
View File

@@ -347,6 +347,7 @@ class TestWeb(BaseTestWeb):
'aliases': [],
'state': 'unknown'}],
},
'override_checkout': None,
'parent': 'base',
'post_review': None,
'protected': None,
@@ -388,6 +389,7 @@ class TestWeb(BaseTestWeb):
'aliases': [],
'state': 'unknown'}],
},
'override_checkout': None,
'parent': 'base',
'post_review': None,
'protected': None,
@@ -424,6 +426,7 @@ class TestWeb(BaseTestWeb):
'irrelevant_files': [],
'match_on_config_updates': True,
'name': 'test-job',
'override_checkout': None,
'parent': 'base',
'post_review': None,
'protected': None,
@@ -542,6 +545,7 @@ class TestWeb(BaseTestWeb):
'irrelevant_files': [],
'match_on_config_updates': True,
'name': 'project-merge',
'override_checkout': None,
'parent': 'base',
'post_review': None,
'protected': None,
@@ -576,6 +580,7 @@ class TestWeb(BaseTestWeb):
'irrelevant_files': [],
'match_on_config_updates': True,
'name': 'project-test1',
'override_checkout': None,
'parent': 'base',
'post_review': None,
'protected': None,
@@ -610,6 +615,7 @@ class TestWeb(BaseTestWeb):
'irrelevant_files': [],
'match_on_config_updates': True,
'name': 'project-test2',
'override_checkout': None,
'parent': 'base',
'post_review': None,
'protected': None,
@@ -644,6 +650,7 @@ class TestWeb(BaseTestWeb):
'irrelevant_files': [],
'match_on_config_updates': True,
'name': 'project1-project2-integration',
'override_checkout': None,
'parent': 'base',
'post_review': None,
'protected': None,
@@ -698,6 +705,7 @@ class TestWeb(BaseTestWeb):
'irrelevant_files': [],
'match_on_config_updates': True,
'name': 'project-post',
'override_checkout': None,
'parent': 'base',
'post_review': None,
'post_run': [],

2
web/src/containers/job/JobVariant.jsx
View File

@@ -85,7 +85,7 @@ class JobVariant extends React.Component {
const jobInfos = [
'description', 'context', 'builds', 'status',
'parent', 'attempts', 'timeout', 'semaphore', 'implied_branch',
'nodeset', 'variables',
'nodeset', 'variables', 'override_checkout',
]
jobInfos.forEach(key => {
let label = key

1
zuul/model.py
View File

@@ -1239,6 +1239,7 @@ class Job(ConfigObject):
d = {}
d['name'] = self.name
d['branches'] = self._branches
d['override_checkout'] = self.override_checkout
d['files'] = self._files
d['irrelevant_files'] = self._irrelevant_files
d['variant_description'] = self.variant_description