890aaa12c1
The git describe command reports errors if there are no tags to be used to get a description. Trap the errors in places where it is reasonable to encounter that situation. Change-Id: I436af248b1740c493b14178cbbe59c8b0474aa94
173 lines
5.6 KiB
Python
173 lines
5.6 KiB
Python
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""Show the changes that will be included in the release.
|
|
"""
|
|
|
|
from __future__ import print_function
|
|
|
|
import argparse
|
|
import atexit
|
|
import os
|
|
import os.path
|
|
import shutil
|
|
import subprocess
|
|
import tempfile
|
|
|
|
import yaml
|
|
|
|
from openstack_releases import defaults
|
|
from openstack_releases import gitutils
|
|
|
|
|
|
def git_log(workdir, repo, title, git_range):
|
|
header = '%s %s' % (title, git_range)
|
|
print('\n%s' % header)
|
|
print('-' * len(header))
|
|
subprocess.check_call(['git', 'log', '--no-color',
|
|
'--format=%h %ci %s', '--no-merges',
|
|
git_range],
|
|
cwd=os.path.join(workdir, repo))
|
|
print()
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument(
|
|
'--no-cleanup',
|
|
dest='cleanup',
|
|
default=True,
|
|
action='store_false',
|
|
help='do not remove temporary files',
|
|
)
|
|
parser.add_argument(
|
|
'input',
|
|
nargs='*',
|
|
help=('YAML files to validate, defaults to '
|
|
'files changed in the latest commit'),
|
|
)
|
|
args = parser.parse_args()
|
|
|
|
filenames = args.input or gitutils.find_modified_deliverable_files()
|
|
if not filenames:
|
|
print('no modified deliverable files, skipping report')
|
|
return 0
|
|
|
|
workdir = tempfile.mkdtemp(prefix='releases-')
|
|
print('creating temporary files in %s' % workdir)
|
|
|
|
def cleanup_workdir():
|
|
if args.cleanup:
|
|
try:
|
|
shutil.rmtree(workdir)
|
|
except:
|
|
pass
|
|
else:
|
|
print('not cleaning up %s' % workdir)
|
|
atexit.register(cleanup_workdir)
|
|
|
|
# Remove any inherited PAGER environment variable to avoid
|
|
# blocking the output waiting for input.
|
|
os.environ['PAGER'] = ''
|
|
|
|
for filename in filenames:
|
|
if not os.path.exists(filename):
|
|
print('\n%s was removed, skipping' % filename)
|
|
continue
|
|
print('\nChecking %s' % filename)
|
|
with open(filename, 'r') as f:
|
|
deliverable_info = yaml.load(f.read())
|
|
|
|
series = os.path.basename(
|
|
os.path.dirname(
|
|
os.path.abspath(filename)
|
|
)
|
|
)
|
|
if series == defaults.RELEASE:
|
|
branch = 'master'
|
|
else:
|
|
branch = 'stable/' + series
|
|
|
|
# assume the releases are in order and take the last two
|
|
new_release = deliverable_info['releases'][-1]
|
|
if len(deliverable_info['releases']) >= 2:
|
|
previous_release = deliverable_info['releases'][-2]
|
|
else:
|
|
previous_release = None
|
|
for project in new_release['projects']:
|
|
if gitutils.commit_exists(project['repo'],
|
|
new_release['version']):
|
|
print('%s %s exists already' %
|
|
(project['repo'], new_release['version']))
|
|
continue
|
|
|
|
# Check out the code.
|
|
subprocess.check_call(
|
|
['zuul-cloner',
|
|
'--branch', branch,
|
|
'--workspace', workdir,
|
|
'git://git.openstack.org',
|
|
project['repo'],
|
|
]
|
|
)
|
|
|
|
start_range = (previous_release['projects'][0]['hash']
|
|
if previous_release else None)
|
|
if not start_range:
|
|
start_range = (
|
|
gitutils.get_latest_tag(workdir, project['repo'])
|
|
or
|
|
None
|
|
)
|
|
|
|
if start_range:
|
|
git_range = '%s..%s' % (start_range, project['hash'])
|
|
else:
|
|
git_range = project['hash']
|
|
|
|
# Show the changes since the last release.
|
|
git_log(workdir, project['repo'],
|
|
'Release %s will include' % new_release['version'],
|
|
git_range)
|
|
|
|
# If the sha for HEAD and the requested release don't
|
|
# match, show any unreleased changes on the branch. We ask
|
|
# git to give us the real SHA for the requested release in
|
|
# case the deliverables file has the short version of the
|
|
# hash.
|
|
head_sha = gitutils.sha_for_tag(workdir, project['repo'], 'HEAD')
|
|
requested_sha = gitutils.sha_for_tag(
|
|
workdir,
|
|
project['repo'],
|
|
project['hash'],
|
|
)
|
|
if head_sha == requested_sha:
|
|
print('Request releases from HEAD on %s' % branch)
|
|
else:
|
|
git_log(workdir, project['repo'], 'Release will NOT include',
|
|
'%s..%s' % (requested_sha, head_sha))
|
|
|
|
# Show more details about the commit being tagged.
|
|
print()
|
|
print('git describe %s' % project['hash'])
|
|
try:
|
|
subprocess.check_call(
|
|
['git', 'describe', project['hash']],
|
|
cwd=os.path.join(workdir, project['repo']),
|
|
)
|
|
except subprocess.CalledProcessError as e:
|
|
print('WARNING: Could not run git describe: %s' % e)
|
|
|
|
return 0
|