openstack/releases
Code Issues Proposed changes

remove redundant series name argument from validation functions

Browse Source 
Change-Id: I7d4072220b0f37265e5be8cf70187810796e157c
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2018-02-21 19:12:38 -05:00
parent 0c2e656383
commit 2a279b6c34
2 changed files with 20 additions and 63 deletions
openstack_releases
cmds
validate.py
tests
test_validate.py

24
openstack_releases/cmds/validate.py

@ -157,7 +157,7 @@ def validate_series_open(deliv, filename, messages):
expected_branch, previous_deliverable_file, deliv.series))
def validate_series_first(deliv, series_name, messages):
def validate_series_first(deliv, messages):
"The first release in a series needs to end with '.0'."
header('Validate Series First')
@ -262,7 +262,7 @@ def validate_release_notes(deliv, messages):
LOG.debug('{} OK'.format(link))
def validate_model(deliv, series_name, messages):
def validate_model(deliv, messages):
"Require a valid release model"
header('Validate Model')
@ -549,7 +549,6 @@ def validate_pypi_permissions(deliv, zuul_projects, workdir,
def validate_releases(deliv, zuul_projects,
series_name,
workdir,
messages):
"""Apply validation rules to the 'releases' list for the deliverable.
@ -691,7 +690,7 @@ def validate_releases(deliv, zuul_projects,
# the rules are broken because there are
# cases where we do need to support point
# releases with requirements updates.
if series_name == defaults.RELEASE:
if deliv.series == defaults.RELEASE:
report = messages.error
else:
report = messages.warning
@ -720,12 +719,12 @@ def validate_releases(deliv, zuul_projects,
# targeted branch.
if not gitutils.check_branch_sha(workdir,
project.repo.name,
series_name,
deliv.series,
project.hash):
msg = '%s %s not present in %s branch' % (
project.repo.name,
project.hash,
series_name,
deliv.series,
)
messages.error(msg)
@ -838,7 +837,7 @@ def validate_branch_prefixes(deliv, messages):
branch.name, _VALID_BRANCH_PREFIXES))
def validate_stable_branches(deliv, workdir, series_name, messages):
def validate_stable_branches(deliv, workdir, messages):
"Apply the rules for stable branches."
header('Validate Stable Branches')
@ -938,7 +937,7 @@ def validate_stable_branches(deliv, workdir, series_name, messages):
'skipping branch name check for upstream mode'
)
elif series_name == '_independent':
elif deliv.is_independent:
if series not in known_series:
messages.error(
('stable branches must be named for known series '
@ -947,11 +946,11 @@ def validate_stable_branches(deliv, workdir, series_name, messages):
)
else:
if series != series_name:
if series != deliv.series:
messages.error(
('cycle-based projects must match series names '
'for stable branches. %s should be stable/%s' % (
branch.name, series_name))
branch.name, deliv.series))
)
@ -1265,7 +1264,7 @@ def main():
validate_bugtracker(deliv, messages)
validate_team(deliv, team_data, messages)
validate_release_notes(deliv, messages)
validate_model(deliv, deliv.series, messages)
validate_model(deliv, messages)
validate_release_type(
deliv,
zuul_projects,
@ -1282,7 +1281,6 @@ def main():
validate_releases(
deliv,
zuul_projects,
deliv.series,
workdir,
messages,
)
@ -1301,7 +1299,6 @@ def main():
)
validate_series_first(
deliv,
deliv.series,
messages,
)
validate_branch_prefixes(
@ -1311,7 +1308,6 @@ def main():
validate_stable_branches(
deliv,
workdir,
deliv.series,
messages,
)
validate_feature_branches(

59
openstack_releases/tests/test_validate.py

@ -320,7 +320,6 @@ class TestValidateModel(base.BaseTestCase):
name='name',
data={},
),
'ocata',
self.msg,
)
self.msg.show_summary()
@ -335,7 +334,6 @@ class TestValidateModel(base.BaseTestCase):
name='name',
data={},
),
'independent',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -349,7 +347,6 @@ class TestValidateModel(base.BaseTestCase):
name='name',
data={'release-model': 'independent'},
),
'independent',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -363,7 +360,6 @@ class TestValidateModel(base.BaseTestCase):
name='name',
data={'release-model': 'cycle-with-intermediary'},
),
'independent',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -377,7 +373,6 @@ class TestValidateModel(base.BaseTestCase):
name='name',
data={'release-model': 'independent'},
),
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -391,7 +386,6 @@ class TestValidateModel(base.BaseTestCase):
name='name',
data={'release-model': 'cycle-with-intermediary'},
),
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -426,7 +420,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'ocata',
self.tmpdir,
self.msg,
)
@ -454,7 +447,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'ocata',
self.tmpdir,
self.msg,
)
@ -482,7 +474,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'ocata',
self.tmpdir,
self.msg,
)
@ -493,7 +484,7 @@ class TestValidateReleases(base.BaseTestCase):
def test_mismatch_existing(self):
deliv = deliverable.Deliverable(
team='team',
series='ocata',
series='newton',
name='name',
data={
'artifact-link-mode': 'none',
@ -510,7 +501,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'newton',
self.tmpdir,
self.msg,
)
@ -521,7 +511,7 @@ class TestValidateReleases(base.BaseTestCase):
def test_hash_from_master_used_in_stable_release(self):
deliv = deliverable.Deliverable(
team='team',
series='ocata',
series='newton',
name='name',
data={
'artifact-link-mode': 'none',
@ -539,7 +529,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'newton',
self.tmpdir,
self.msg,
)
@ -550,7 +539,7 @@ class TestValidateReleases(base.BaseTestCase):
def test_hash_from_master_used_in_stable_release2(self):
deliv = deliverable.Deliverable(
team='team',
series='ocata',
series='newton',
name='name',
data={
'artifact-link-mode': 'none',
@ -574,7 +563,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'newton',
self.tmpdir,
self.msg,
)
@ -585,7 +573,7 @@ class TestValidateReleases(base.BaseTestCase):
def test_hash_from_stable_used_in_master_release(self):
deliv = deliverable.Deliverable(
team='team',
series='ocata',
series=defaults.RELEASE,
name='name',
data={
'artifact-link-mode': 'none',
@ -603,7 +591,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
defaults.RELEASE,
self.tmpdir,
self.msg,
)
@ -614,7 +601,7 @@ class TestValidateReleases(base.BaseTestCase):
def test_hash_from_master_used_after_default_branch_should_exist_but_does_not(self):
deliv = deliverable.Deliverable(
team='team',
series='ocata',
series='austin',
name='name',
data={
'artifact-link-mode': 'none',
@ -630,7 +617,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'austin',
self.tmpdir,
self.msg,
)
@ -641,7 +627,7 @@ class TestValidateReleases(base.BaseTestCase):
def test_not_descendent(self):
deliv = deliverable.Deliverable(
team='team',
series='ocata',
series='meiji',
name='name',
data={
'artifact-link-mode': 'none',
@ -666,7 +652,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'meiji',
self.tmpdir,
self.msg,
)
@ -700,7 +685,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'ocata',
self.tmpdir,
self.msg,
)
@ -734,7 +718,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'ocata',
self.tmpdir,
self.msg,
)
@ -757,7 +740,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'ocata',
self.tmpdir,
self.msg,
)
@ -785,7 +767,6 @@ class TestValidateReleases(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'ocata',
self.tmpdir,
self.msg,
)
@ -1015,7 +996,7 @@ class TestPuppetUtils(base.BaseTestCase):
cbs.return_value = True
deliv = deliverable.Deliverable(
team='team',
series='series',
series='ocata',
name='name',
data={
'artifact-link-mode': 'none',
@ -1031,7 +1012,6 @@ class TestPuppetUtils(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'ocata',
self.tmpdir,
self.msg,
)
@ -1064,7 +1044,6 @@ class TestPuppetUtils(base.BaseTestCase):
validate.validate_releases(
deliv,
{'validate-projects-by-name': {}},
'ocata',
self.tmpdir,
self.msg,
)
@ -1524,7 +1503,6 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -1550,7 +1528,6 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -1576,13 +1553,12 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
self.assertEqual(1, len(self.msg.errors))
def test_unknown_series_cycle(self):
def test_mismatched_series_cycle(self):
deliverable_data = textwrap.dedent('''
releases:
- version: 0.0.3
@ -1590,19 +1566,18 @@ class TestValidateStableBranches(base.BaseTestCase):
- repo: openstack/release-test
hash: 0cd17d1ee3b9284d36b2a0d370b49a6f0bbb9660
branches:
- name: stable/abc
- name: stable/def
location: 0.0.3
''')
deliv = deliverable.Deliverable(
team='team',
series='ocata',
series='abc',
name='release-test',
data=yamlutils.loads(deliverable_data),
)
validate.validate_stable_branches(
deliv,
self.tmpdir,
'ocata',
self.msg,
)
self.msg.show_summary()
@ -1629,7 +1604,6 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'independent',
self.msg,
)
self.msg.show_summary()
@ -1659,7 +1633,6 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'independent',
self.msg,
)
self.msg.show_summary()
@ -1687,7 +1660,6 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -1714,7 +1686,6 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -1741,7 +1712,6 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -1769,7 +1739,6 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -1797,7 +1766,6 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -1825,7 +1793,6 @@ class TestValidateStableBranches(base.BaseTestCase):
validate.validate_stable_branches(
deliv,
self.tmpdir,
'ocata',
self.msg,
)
self.assertEqual(0, len(self.msg.warnings))
@ -2368,7 +2335,6 @@ class TestValidateSeriesFirst(base.BaseTestCase):
)
validate.validate_series_first(
deliv,
'a',
self.msg,
)
self.msg.show_summary()
@ -2401,7 +2367,6 @@ class TestValidateSeriesFirst(base.BaseTestCase):
)
validate.validate_series_first(
deliv,
'a',
self.msg,
)
self.msg.show_summary()
@ -2426,7 +2391,6 @@ class TestValidateSeriesFirst(base.BaseTestCase):
)
validate.validate_series_first(
deliv,
'a',
self.msg,
)
self.msg.show_summary()
@ -2455,7 +2419,6 @@ class TestValidateSeriesFirst(base.BaseTestCase):
)
validate.validate_series_first(
deliv,
'a',
self.msg,
)
self.msg.show_summary()
@ -2484,7 +2447,6 @@ class TestValidateSeriesFirst(base.BaseTestCase):
)
validate.validate_series_first(
deliv,
'a',
self.msg,
)
self.msg.show_summary()
@ -2513,7 +2475,6 @@ class TestValidateSeriesFirst(base.BaseTestCase):
)
validate.validate_series_first(
deliv,
'a',
self.msg,
)
self.msg.show_summary()