You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by to...@apache.org on 2018/08/09 21:48:14 UTC
[8/9] impala git commit: IMPALA-7399: Add script in lib/python to
generate junit XML.
IMPALA-7399: Add script in lib/python to generate junit XML.
This patch adds a script to generate junit XML reports for arbitrary
build steps. It's also being used to seed the creation of an internal
python library for Impala development that can be pip installed into
a development environment.
Change-Id: If6024d74075ea69b8ee20d1fc3cc9c1ff821ba5b
Reviewed-on: http://gerrit.cloudera.org:8080/11128
Reviewed-by: David Knupp <dk...@cloudera.com>
Tested-by: David Knupp <dk...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/8f9f91f3
Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/8f9f91f3
Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/8f9f91f3
Branch: refs/heads/master
Commit: 8f9f91f38bebba3c69fc15cc522840941b871658
Parents: d958b47
Author: David Knupp <dk...@cloudera.com>
Authored: Fri Aug 3 14:44:06 2018 -0700
Committer: David Knupp <dk...@cloudera.com>
Committed: Thu Aug 9 20:53:48 2018 +0000
----------------------------------------------------------------------
bin/rat_exclude_files.txt | 2 +
lib/python/impala_py_lib/__init__.py | 0
lib/python/impala_py_lib/jenkins/__init__.py | 0
.../impala_py_lib/jenkins/generate_junitxml.py | 161 +++++++++++++++++++
lib/python/requirements.txt | 20 +++
lib/python/setup.py | 69 ++++++++
6 files changed, 252 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/impala/blob/8f9f91f3/bin/rat_exclude_files.txt
----------------------------------------------------------------------
diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt
index 170dd24..980cfba 100644
--- a/bin/rat_exclude_files.txt
+++ b/bin/rat_exclude_files.txt
@@ -19,6 +19,8 @@ testdata/__init__.py
tests/__init__.py
bin/diagnostics/__init__.py
www/index.html
+lib/python/impala_py_lib/__init__.py
+lib/python/impala_py_lib/jenkins/__init__.py
# See $IMPALA_HOME/LICENSE.txt
be/src/gutil/*
http://git-wip-us.apache.org/repos/asf/impala/blob/8f9f91f3/lib/python/impala_py_lib/__init__.py
----------------------------------------------------------------------
diff --git a/lib/python/impala_py_lib/__init__.py b/lib/python/impala_py_lib/__init__.py
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/impala/blob/8f9f91f3/lib/python/impala_py_lib/jenkins/__init__.py
----------------------------------------------------------------------
diff --git a/lib/python/impala_py_lib/jenkins/__init__.py b/lib/python/impala_py_lib/jenkins/__init__.py
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/impala/blob/8f9f91f3/lib/python/impala_py_lib/jenkins/generate_junitxml.py
----------------------------------------------------------------------
diff --git a/lib/python/impala_py_lib/jenkins/generate_junitxml.py b/lib/python/impala_py_lib/jenkins/generate_junitxml.py
new file mode 100644
index 0000000..ff93aa4
--- /dev/null
+++ b/lib/python/impala_py_lib/jenkins/generate_junitxml.py
@@ -0,0 +1,161 @@
+#!/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.
+
+"""
+A script for generating arbitrary junit XML reports while building Impala.
+These files will be consumed by jenkins.impala.io to generate reports for
+easier triaging of build and setup errors.
+"""
+import argparse
+import errno
+import os
+import pytz
+import textwrap
+
+from datetime import datetime as dt
+from junit_xml import TestSuite, TestCase
+
+IMPALA_HOME = os.getenv('IMPALA_HOME', '.')
+
+
+def get_xml_content(file_or_string=None):
+ """
+ Derive content for the XML report.
+
+ Args:
+ file_or_string: a path to a file, or a plain string
+
+ If the supplied parameter is the path to a file, the contents will be inserted
+ into the XML report. If the parameter is just plain string, use that as the
+ content for the report.
+ """
+ if file_or_string is None:
+ content = ''
+ elif os.path.exists(file_or_string):
+ with open(file_or_string, 'r') as f:
+ content = f.read()
+ else:
+ content = file_or_string
+ return content
+
+
+def generate_xml_file(testsuite, junitxml_logdir='.'):
+ """
+ Create a timestamped XML report file.
+
+ Args:
+ testsuite: junit_xml.TestSuite object
+ junitxml_logdir: path to directory where the file will be created
+
+ Return:
+ junit_log_file: path to the generated file
+ """
+ ts_string = testsuite.timestamp.strftime('%Y%m%d_%H_%M_%S')
+ junit_log_file = os.path.join(junitxml_logdir,
+ '{}.{}.xml'.format(testsuite.name, ts_string))
+
+ with open(junit_log_file, 'w') as f:
+ TestSuite.to_file(f, [testsuite], prettyprint=True)
+
+ return junit_log_file
+
+
+def get_options():
+ """Parse and return command line options."""
+ parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+
+ # Required options
+ parser.add_argument("--phase",
+ default="buildall",
+ help="General build phase or script.")
+ parser.add_argument("--step",
+ required=True,
+ help=textwrap.dedent(
+ """Specific build step or child script being run.
+ Each step must be unique for the given build phase.""")
+ )
+ parser.add_argument("-t", "--time",
+ type=float,
+ default=0,
+ help="If known, the elapsed time in seconds for this step.")
+ parser.add_argument("--stdout",
+ help=textwrap.dedent(
+ """Standard output to include in the XML report. Can be
+ either a string or the path to a file..""")
+ )
+ parser.add_argument("--stderr",
+ help=textwrap.dedent(
+ """Standard error to include in the XML report. Can be
+ either a string or the path to a file.""")
+ )
+ parser.add_argument("--error",
+ help=textwrap.dedent(
+ """If specified, the XML report will mark this as an error.
+ This should be a brief explanation for the error.""")
+ )
+
+ return parser.parse_args()
+
+
+def main():
+ """
+ Create a "testcase" for each invocation of the script, and output the results
+ of the test case to an XML file within $IMPALA_HOME/logs/extra_junit_xml_logs.
+ The log file name will use "phase" and "step" values provided on the command
+ line to structure the report. The XML report filename will follow the form:
+
+ junitxml_logger.<phase>.<step>.<time_stamp>.xml
+
+ Phase can be repeated in a given test run, but the step leaf node, which is
+ equivalent to a "test case", must be unique within each phase.
+ """
+ junitxml_logdir = os.path.join(IMPALA_HOME, 'logs', 'extra_junit_xml_logs')
+
+ # The equivalent of mkdir -p
+ try:
+ os.makedirs(junitxml_logdir)
+ except OSError as e:
+ if e.errno == errno.EEXIST and os.path.isdir(junitxml_logdir):
+ pass
+ else:
+ raise
+
+ options = get_options()
+ root_name, _ = os.path.splitext(os.path.basename(__file__))
+
+ tc = TestCase(classname='{}.{}'.format(root_name, options.phase),
+ name=options.step,
+ elapsed_sec=options.time,
+ stdout=get_xml_content(options.stdout),
+ stderr=get_xml_content(options.stderr))
+
+ # Specifying an error message for any step causes the buid to be marked as invalid.
+ if options.error:
+ tc.add_error_info(get_xml_content(options.error))
+ assert tc.is_error()
+
+ testsuite = TestSuite(name='{}.{}.{}'.format(root_name, options.phase, options.step),
+ timestamp=dt.utcnow().replace(tzinfo=pytz.UTC),
+ test_cases=[tc])
+
+ xml_report = generate_xml_file(testsuite, junitxml_logdir)
+ print("Generated: {}".format(xml_report))
+
+
+if "__main__" == __name__:
+ main()
http://git-wip-us.apache.org/repos/asf/impala/blob/8f9f91f3/lib/python/requirements.txt
----------------------------------------------------------------------
diff --git a/lib/python/requirements.txt b/lib/python/requirements.txt
new file mode 100644
index 0000000..1995eb0
--- /dev/null
+++ b/lib/python/requirements.txt
@@ -0,0 +1,20 @@
+# 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.
+
+junit-xml==1.8
+pytz==2018.5
+six==1.11.0
http://git-wip-us.apache.org/repos/asf/impala/blob/8f9f91f3/lib/python/setup.py
----------------------------------------------------------------------
diff --git a/lib/python/setup.py b/lib/python/setup.py
new file mode 100644
index 0000000..c2b3cec
--- /dev/null
+++ b/lib/python/setup.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# 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.
+
+
+"""This library package contains Impala jenkins-related utilities.
+The tooling here is intended for Impala testing and is not installed
+as part of production Impala clusters.
+"""
+
+from __future__ import absolute_import
+
+from setuptools import find_packages
+
+try:
+ from setuptools import setup
+except ImportError:
+ from distutils.core import setup
+
+
+def parse_requirements(requirements_file='requirements.txt'):
+ """
+ Parse requirements from the requirements file, stripping comments.
+
+ Args:
+ requirements_file: path to a requirements file
+
+ Returns:
+ a list of python packages
+ """
+ lines = []
+ with open(requirements_file) as reqs:
+ for _ in reqs:
+ line = _.split('#')[0]
+ if line.strip():
+ lines.append(line)
+ return lines
+
+
+setup(
+ name='impala_py_lib',
+ version='0.0.1',
+ author_email='dev@impala.apache.org',
+ description='Internal python libraries and utilities for Impala development',
+ packages=find_packages(),
+ include_package_data=True,
+ install_requires=parse_requirements(),
+ entry_points={
+ 'console_scripts': [
+ 'generate-junitxml = impala_py_lib.jenkins.generate_junitxml:main'
+ ]
+ }
+)