From 05039748a920bc31b91bb51d431cee0388f83662 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 7 Apr 2016 01:28:20 -0400 Subject: [PATCH] Revert "treat individual release jobs as warnings" Require teams to use the release job templates to ensure they have all the right job definitions in place. This reverts commit ebf3805c3dd773727ff7571d4a3c9e7cc35ef843. Change-Id: I86415b121e7718d6bce71ac56045e5ff48b63493 Signed-off-by: Doug Hellmann --- openstack_releases/project_config.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/openstack_releases/project_config.py b/openstack_releases/project_config.py index e33649d3ae..36ee07c882 100644 --- a/openstack_releases/project_config.py +++ b/openstack_releases/project_config.py @@ -64,23 +64,10 @@ def require_release_jobs_for_repo(zuul_layout, repo): t['name'] for t in p.get('template', []) ] - release_jobs = p.get('release', []) - found_individual_jobs = False - for j in release_jobs: - if 'tarball' in j: - errors.append( - ('found individual tarball job %s for %s in %s' % - (j, repo, ZUUL_LAYOUT_FILENAME), - False) - ) - found_individual_jobs = True - # NOTE(dhellmann): We don't want to mess around looking for - # individual jobs, because we want projects to use the - # templates, but for now only treat that case as a warning. - if found_individual_jobs: - pass - elif not ('openstack-server-release-jobs' in templates or - 'publish-to-pypi' in templates): + # NOTE(dhellmann): We don't mess around looking for individual + # jobs, because we want projects to use the templates. + if not ('openstack-server-release-jobs' in templates or + 'publish-to-pypi' in templates): errors.append( ('%s has neither openstack-server-release-jobs ' 'nor publish-to-pypi defined for %s so no release '