openstack
/
releases
Code Issues Proposed changes

Switch back to publish-to-pypi 

We updated publish-to-pypi so that it has the same content as
publish-to-pypi-python3 - and then replaced publish-to-pypi-python3 with
publish-to-pypi. Thus, publish-to-pypi does what publish-to-pypi-python3
has done previously.

Since all repos have been updated to use publish-to-pypi, check for that
one again.

Change-Id: I09ed2370a4d1f1bfb94cf73a951d0f1f6af36be6
Depends-On: https://review.openstack.org/615239
This commit is contained in:
Andreas Jaeger 2018-11-02 19:16:39 +01:00
parent 1701af33b6
commit c9152cc789
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openstack_releases/project_config.py
View File

@ -137,16 +137,16 @@ def read_templates_from_repo(workdir, repo_name):
# Which jobs are needed for which release types.
_RELEASE_JOBS_FOR_TYPE = {
'python-service': [
'publish-to-pypi-python3',
'publish-to-pypi',
],
'python-pypi': [
'publish-to-pypi-python3',
'publish-to-pypi',
],
'neutron': [
'publish-to-pypi-python3',
'publish-to-pypi',
],
'horizon': [
'publish-to-pypi-python3',
'publish-to-pypi',
],
'nodejs': [
'nodejs4-publish-to-npm',
@ -158,7 +158,7 @@ _RELEASE_JOBS_FOR_TYPE = {
'puppet-release-jobs',
],
'xstatic': [
'publish-to-pypi-python3',
'publish-to-pypi',
],
'fuel': [
# Fuel is manually packaged by the team at Mirantis.

20
openstack_releases/tests/test_project_config.py
View File

@ -114,7 +114,7 @@ class TestReleaseJobsGlobal(base.BaseTestCase):
self.ctx._zuul_projects = {
'openstack/releases': {
'templates': [
'publish-to-pypi-python3',
'publish-to-pypi',
],
},
}
@ -142,7 +142,7 @@ class TestReleaseJobsGlobal(base.BaseTestCase):
self.ctx._zuul_projects = {
'openstack/releases': {
'templates': [
'publish-to-pypi-python3',
'publish-to-pypi',
'puppet-tarball-jobs',
],
}
@ -183,11 +183,11 @@ class TestReleaseJobsInTree(base.BaseTestCase):
- project:
templates:
- noop-jobs
- publish-to-pypi-python3
- publish-to-pypi
'''))
templates = project_config.read_templates_from_repo(
self.ctx.workdir, self.repo.name)
self.assertEqual(['noop-jobs', 'publish-to-pypi-python3'], templates)
self.assertEqual(['noop-jobs', 'publish-to-pypi'], templates)
def test_zuul(self):
filename = os.path.join(self.repo.path, 'zuul.yaml')
@ -196,11 +196,11 @@ class TestReleaseJobsInTree(base.BaseTestCase):
- project:
templates:
- noop-jobs
- publish-to-pypi-python3
- publish-to-pypi
'''))
templates = project_config.read_templates_from_repo(
self.ctx.workdir, self.repo.name)
self.assertEqual(['noop-jobs', 'publish-to-pypi-python3'], templates)
self.assertEqual(['noop-jobs', 'publish-to-pypi'], templates)
def test_zuul_dot_d(self):
filename = os.path.join(self.repo.path, 'zuul.d/projects.yaml')
@ -209,11 +209,11 @@ class TestReleaseJobsInTree(base.BaseTestCase):
- project:
templates:
- noop-jobs
- publish-to-pypi-python3
- publish-to-pypi
'''))
templates = project_config.read_templates_from_repo(
self.ctx.workdir, self.repo.name)
self.assertEqual(['noop-jobs', 'publish-to-pypi-python3'], templates)
self.assertEqual(['noop-jobs', 'publish-to-pypi'], templates)
def test_dot_zuul_dot_d(self):
filename = os.path.join(self.repo.path, '.zuul.d/projects.yaml')
@ -222,8 +222,8 @@ class TestReleaseJobsInTree(base.BaseTestCase):
- project:
templates:
- noop-jobs
- publish-to-pypi-python3
- publish-to-pypi
'''))
templates = project_config.read_templates_from_repo(
self.ctx.workdir, self.repo.name)
self.assertEqual(['noop-jobs', 'publish-to-pypi-python3'], templates)
self.assertEqual(['noop-jobs', 'publish-to-pypi'], templates)