2017-04-17 12:24:54 +03:00
|
|
|
#!/usr/bin/env python
|
|
|
|
|
|
|
|
#
|
|
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
# contributor license agreements. See the NOTICE file distributed with
|
|
|
|
# this work for additional information regarding copyright ownership.
|
|
|
|
# The ASF licenses this file to You 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.
|
|
|
|
#
|
|
|
|
|
|
|
|
# Utility for creating well-formed pull request merges and pushing them to
|
|
|
|
# Apache.
|
|
|
|
#
|
|
|
|
# usage: ./airflow-jira (see config env vars below)
|
|
|
|
#
|
|
|
|
# This utility assumes you already have a local Airflow git folder and that you
|
|
|
|
# have added remotes corresponding to both (i) the github apache Airflow
|
|
|
|
# mirror and (ii) the apache git repo.
|
|
|
|
|
|
|
|
# This tool is based on the Spark merge_spark_pr script:
|
|
|
|
# https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py
|
|
|
|
|
|
|
|
from __future__ import print_function
|
|
|
|
|
|
|
|
import jira
|
|
|
|
import re
|
|
|
|
import sys
|
|
|
|
|
|
|
|
TMP_CREDENTIALS = {}
|
|
|
|
PROJECT = "AIRFLOW"
|
|
|
|
|
|
|
|
# Python 3 compatibility
|
|
|
|
if sys.version_info[0] == 3:
|
|
|
|
raw_input = input
|
|
|
|
|
|
|
|
try:
|
|
|
|
import click
|
|
|
|
except ImportError:
|
|
|
|
print("Could not find the click library. Run 'sudo pip install click' to install.")
|
|
|
|
sys.exit(-1)
|
|
|
|
|
|
|
|
try:
|
|
|
|
import git
|
|
|
|
except ImportError:
|
|
|
|
print("Could not import git. Run 'sudo pip install gitpython' to install")
|
|
|
|
sys.exit(-1)
|
|
|
|
|
|
|
|
JIRA_BASE = "https://issues.apache.org/jira/browse"
|
|
|
|
JIRA_API_BASE = "https://issues.apache.org/jira"
|
|
|
|
|
|
|
|
GIT_COMMIT_FIELDS = ['id', 'author_name', 'author_email', 'date', 'subject', 'body']
|
|
|
|
GIT_LOG_FORMAT = ['%H', '%an', '%ae', '%ad', '%s', '%b']
|
|
|
|
GIT_LOG_FORMAT = '%x1f'.join(GIT_LOG_FORMAT) + '%x1e'
|
|
|
|
|
|
|
|
|
|
|
|
def get_jiras_for_version(version):
|
2018-09-04 12:26:17 +03:00
|
|
|
asf_jira = jira.client.JIRA({'server': JIRA_API_BASE})
|
2017-04-17 12:24:54 +03:00
|
|
|
|
2018-09-04 12:26:17 +03:00
|
|
|
return asf_jira.search_issues(
|
|
|
|
'PROJECT={} and fixVersion={}'.format(PROJECT, version)
|
|
|
|
)
|
2017-04-17 12:24:54 +03:00
|
|
|
|
|
|
|
|
|
|
|
def get_merged_issues(version):
|
|
|
|
repo = git.Repo(".", search_parent_directories=True)
|
|
|
|
log = repo.git.log('--format={}'.format(GIT_LOG_FORMAT))
|
|
|
|
log = log.strip('\n\x1e').split("\x1e")
|
|
|
|
log = [row.strip().split("\x1f") for row in log]
|
|
|
|
log = [dict(zip(GIT_COMMIT_FIELDS, row)) for row in log]
|
|
|
|
|
|
|
|
issue_re = re.compile(".*(AIRFLOW-[0-9]{1,6})(\]|\s|:)")
|
|
|
|
pr_re = re.compile("(.*)Closes (#[0-9]{1,6})", flags=re.DOTALL)
|
|
|
|
|
|
|
|
merges = {}
|
|
|
|
for log_item in log:
|
|
|
|
issue_id = None
|
|
|
|
|
|
|
|
match = issue_re.match(log_item['subject'])
|
|
|
|
if match:
|
|
|
|
issue_id = match.group(1)
|
2018-09-04 12:26:17 +03:00
|
|
|
if 'body' in log_item:
|
2017-04-17 12:24:54 +03:00
|
|
|
match = pr_re.match(log_item['body'])
|
|
|
|
if match:
|
|
|
|
log_item['pull_request'] = match.group(2)
|
|
|
|
else:
|
|
|
|
log_item['pull_request'] = '#na'
|
|
|
|
else:
|
|
|
|
log_item['pull_request'] = '#na'
|
|
|
|
|
|
|
|
if issue_id:
|
|
|
|
merges[issue_id] = log_item
|
|
|
|
|
|
|
|
return merges
|
|
|
|
|
2018-09-04 12:26:17 +03:00
|
|
|
|
2017-04-17 12:24:54 +03:00
|
|
|
@click.group()
|
|
|
|
def cli():
|
|
|
|
r"""
|
|
|
|
This tool should be used by Airflow Release Manager to verify what Jira's
|
|
|
|
were merged in the current working branch.
|
|
|
|
|
|
|
|
airflow-jira compare <target_version>
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
@cli.command(short_help='Compare a jira target version against git merges')
|
|
|
|
@click.argument('target_version', default=None)
|
|
|
|
def compare(target_version):
|
|
|
|
merges = get_merged_issues(target_version)
|
|
|
|
issues = get_jiras_for_version(target_version)
|
|
|
|
|
2018-09-04 12:26:17 +03:00
|
|
|
# :<18 says left align, pad to 18
|
|
|
|
# :<50.50 truncates after 50 chars
|
|
|
|
# !s forces as string - some of the Jira objects have a string method, but
|
|
|
|
# Py3 doesn't call by default
|
|
|
|
formatstr = "{id:<18}|{typ!s:<12}||{priority!s:<10}||{status!s:<10}|" \
|
|
|
|
"{description:<50.50}|{merged:<6}|{pr:<6}|{commit:<40}"
|
|
|
|
|
|
|
|
print(formatstr.format(
|
|
|
|
id="ISSUE ID",
|
|
|
|
typ="TYPE",
|
|
|
|
priority="PRIORITY",
|
|
|
|
status="STATUS",
|
|
|
|
description="DESCRIPTION",
|
|
|
|
merged="MERGED",
|
|
|
|
pr="PR",
|
|
|
|
commit="COMMIT"))
|
2017-04-17 12:24:54 +03:00
|
|
|
|
|
|
|
for issue in issues:
|
|
|
|
is_merged = issue.key in merges
|
2018-09-04 12:26:17 +03:00
|
|
|
print(formatstr.format(
|
|
|
|
id=issue.key,
|
|
|
|
typ=issue.fields.issuetype,
|
|
|
|
priority=issue.fields.priority,
|
|
|
|
status=issue.fields.status,
|
|
|
|
description=issue.fields.summary,
|
|
|
|
merged=is_merged,
|
|
|
|
pr=merges[issue.key]['pull_request'] if is_merged else "-",
|
|
|
|
commit=merges[issue.key]['id'] if is_merged else "-"))
|
2017-04-17 12:24:54 +03:00
|
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
import doctest
|
|
|
|
(failure_count, test_count) = doctest.testmod()
|
|
|
|
if failure_count:
|
|
|
|
exit(-1)
|
|
|
|
try:
|
|
|
|
cli()
|
|
|
|
except:
|
|
|
|
raise
|