update get_release_type to take a repo name
Instead of passing a full project dict, pass just the value we need. This will let us reuse this function in places where we don't have a project dict. Change-Id: Id25e98c7b6dbf3cfb711447394f2d9ade5fc5674 Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
@@ -400,7 +400,7 @@ _TYPE_TO_RELEASE_TYPE = {
|
|||||||
_PYTHON_RELEASE_TYPES = ['python-service', 'python-pypi', 'neutron', 'horizon']
|
_PYTHON_RELEASE_TYPES = ['python-service', 'python-pypi', 'neutron', 'horizon']
|
||||||
|
|
||||||
|
|
||||||
def get_release_type(deliverable_info, project, workdir):
|
def get_release_type(deliverable_info, repo, workdir):
|
||||||
"""Return tuple with release type and boolean indicating whether it
|
"""Return tuple with release type and boolean indicating whether it
|
||||||
was explicitly set.
|
was explicitly set.
|
||||||
|
|
||||||
@@ -415,10 +415,10 @@ def get_release_type(deliverable_info, project, workdir):
|
|||||||
if deliverable_info.get('include-pypi-link', False):
|
if deliverable_info.get('include-pypi-link', False):
|
||||||
return ('python-pypi', False)
|
return ('python-pypi', False)
|
||||||
|
|
||||||
if puppetutils.looks_like_a_module(workdir, project['repo']):
|
if puppetutils.looks_like_a_module(workdir, repo):
|
||||||
return ('puppet', False)
|
return ('puppet', False)
|
||||||
|
|
||||||
if npmutils.looks_like_a_module(workdir, project['repo']):
|
if npmutils.looks_like_a_module(workdir, repo):
|
||||||
return ('nodejs', False)
|
return ('nodejs', False)
|
||||||
|
|
||||||
return ('python-service', False)
|
return ('python-service', False)
|
||||||
@@ -451,7 +451,7 @@ def validate_release_type(deliverable_info,
|
|||||||
print('checking release-type for {}'.format(project['repo']))
|
print('checking release-type for {}'.format(project['repo']))
|
||||||
|
|
||||||
release_type, was_explicit = get_release_type(
|
release_type, was_explicit = get_release_type(
|
||||||
deliverable_info, project, workdir,
|
deliverable_info, project['repo'], workdir,
|
||||||
)
|
)
|
||||||
if was_explicit:
|
if was_explicit:
|
||||||
print('found explicit release-type {!r}'.format(
|
print('found explicit release-type {!r}'.format(
|
||||||
@@ -615,7 +615,7 @@ def validate_releases(deliverable_info, zuul_projects,
|
|||||||
else:
|
else:
|
||||||
|
|
||||||
release_type, was_explicit = get_release_type(
|
release_type, was_explicit = get_release_type(
|
||||||
deliverable_info, project, workdir,
|
deliverable_info, project['repo'], workdir,
|
||||||
)
|
)
|
||||||
if was_explicit:
|
if was_explicit:
|
||||||
print('found explicit release-type {!r}'.format(
|
print('found explicit release-type {!r}'.format(
|
||||||
|
|||||||
@@ -800,7 +800,7 @@ class TestGetReleaseType(base.BaseTestCase):
|
|||||||
}
|
}
|
||||||
release_type, explicit = validate.get_release_type(
|
release_type, explicit = validate.get_release_type(
|
||||||
deliverable_info,
|
deliverable_info,
|
||||||
deliverable_info['releases'][0]['projects'][0],
|
deliverable_info['releases'][0]['projects'][0]['repo'],
|
||||||
self.tmpdir,
|
self.tmpdir,
|
||||||
)
|
)
|
||||||
self.assertEqual(('explicitly-set', True), (release_type, explicit))
|
self.assertEqual(('explicitly-set', True), (release_type, explicit))
|
||||||
@@ -819,7 +819,7 @@ class TestGetReleaseType(base.BaseTestCase):
|
|||||||
}
|
}
|
||||||
release_type, explicit = validate.get_release_type(
|
release_type, explicit = validate.get_release_type(
|
||||||
deliverable_info,
|
deliverable_info,
|
||||||
deliverable_info['releases'][0]['projects'][0],
|
deliverable_info['releases'][0]['projects'][0]['repo'],
|
||||||
self.tmpdir,
|
self.tmpdir,
|
||||||
)
|
)
|
||||||
self.assertEqual(('python-pypi', False), (release_type, explicit))
|
self.assertEqual(('python-pypi', False), (release_type, explicit))
|
||||||
@@ -838,7 +838,7 @@ class TestGetReleaseType(base.BaseTestCase):
|
|||||||
}
|
}
|
||||||
release_type, explicit = validate.get_release_type(
|
release_type, explicit = validate.get_release_type(
|
||||||
deliverable_info,
|
deliverable_info,
|
||||||
deliverable_info['releases'][0]['projects'][0],
|
deliverable_info['releases'][0]['projects'][0]['repo'],
|
||||||
self.tmpdir,
|
self.tmpdir,
|
||||||
)
|
)
|
||||||
self.assertEqual(('python-service', False), (release_type, explicit))
|
self.assertEqual(('python-service', False), (release_type, explicit))
|
||||||
@@ -857,7 +857,7 @@ class TestGetReleaseType(base.BaseTestCase):
|
|||||||
}
|
}
|
||||||
release_type, explicit = validate.get_release_type(
|
release_type, explicit = validate.get_release_type(
|
||||||
deliverable_info,
|
deliverable_info,
|
||||||
deliverable_info['releases'][0]['projects'][0],
|
deliverable_info['releases'][0]['projects'][0]['repo'],
|
||||||
self.tmpdir,
|
self.tmpdir,
|
||||||
)
|
)
|
||||||
self.assertEqual(('python-pypi', False), (release_type, explicit))
|
self.assertEqual(('python-pypi', False), (release_type, explicit))
|
||||||
@@ -876,7 +876,7 @@ class TestGetReleaseType(base.BaseTestCase):
|
|||||||
}
|
}
|
||||||
release_type, explicit = validate.get_release_type(
|
release_type, explicit = validate.get_release_type(
|
||||||
deliverable_info,
|
deliverable_info,
|
||||||
deliverable_info['releases'][0]['projects'][0],
|
deliverable_info['releases'][0]['projects'][0]['repo'],
|
||||||
self.tmpdir,
|
self.tmpdir,
|
||||||
)
|
)
|
||||||
self.assertEqual(('python-service', False), (release_type, explicit))
|
self.assertEqual(('python-service', False), (release_type, explicit))
|
||||||
@@ -896,7 +896,7 @@ class TestGetReleaseType(base.BaseTestCase):
|
|||||||
}
|
}
|
||||||
release_type, explicit = validate.get_release_type(
|
release_type, explicit = validate.get_release_type(
|
||||||
deliverable_info,
|
deliverable_info,
|
||||||
deliverable_info['releases'][0]['projects'][0],
|
deliverable_info['releases'][0]['projects'][0]['repo'],
|
||||||
self.tmpdir,
|
self.tmpdir,
|
||||||
)
|
)
|
||||||
self.assertEqual(('puppet', False), (release_type, explicit))
|
self.assertEqual(('puppet', False), (release_type, explicit))
|
||||||
@@ -916,7 +916,7 @@ class TestGetReleaseType(base.BaseTestCase):
|
|||||||
}
|
}
|
||||||
release_type, explicit = validate.get_release_type(
|
release_type, explicit = validate.get_release_type(
|
||||||
deliverable_info,
|
deliverable_info,
|
||||||
deliverable_info['releases'][0]['projects'][0],
|
deliverable_info['releases'][0]['projects'][0]['repo'],
|
||||||
self.tmpdir,
|
self.tmpdir,
|
||||||
)
|
)
|
||||||
self.assertEqual(('nodejs', False), (release_type, explicit))
|
self.assertEqual(('nodejs', False), (release_type, explicit))
|
||||||
@@ -938,7 +938,7 @@ class TestGetReleaseType(base.BaseTestCase):
|
|||||||
}
|
}
|
||||||
release_type, explicit = validate.get_release_type(
|
release_type, explicit = validate.get_release_type(
|
||||||
deliverable_info,
|
deliverable_info,
|
||||||
deliverable_info['releases'][0]['projects'][0],
|
deliverable_info['releases'][0]['projects'][0]['repo'],
|
||||||
self.tmpdir,
|
self.tmpdir,
|
||||||
)
|
)
|
||||||
self.assertEqual(('python-service', False), (release_type, explicit))
|
self.assertEqual(('python-service', False), (release_type, explicit))
|
||||||
|
|||||||
Reference in New Issue
Block a user