You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ka...@apache.org on 2013/06/24 00:31:29 UTC
git commit: SQOOP-1082: Implement pre-commit testing with Jenkins
Updated Branches:
refs/heads/sqoop2 681914c85 -> fe54d473a
SQOOP-1082: Implement pre-commit testing with Jenkins
(Jarek Jarcec Cecho via Kate Ting)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/fe54d473
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/fe54d473
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/fe54d473
Branch: refs/heads/sqoop2
Commit: fe54d473afbfd9982942beb96b582c5b9faab549
Parents: 681914c
Author: Kate Ting <ka...@apache.org>
Authored: Sun Jun 23 18:30:31 2013 -0400
Committer: Kate Ting <ka...@apache.org>
Committed: Sun Jun 23 18:30:31 2013 -0400
----------------------------------------------------------------------
.gitignore | 1 +
dev-support/test-patch.py | 400 +++++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
3 files changed, 402 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe54d473/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index dfd2ae1..62bda43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ target
*.log
.idea
nb-configuration.xml
+patch-process
http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe54d473/dev-support/test-patch.py
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.py b/dev-support/test-patch.py
new file mode 100755
index 0000000..27dbcad
--- /dev/null
+++ b/dev-support/test-patch.py
@@ -0,0 +1,400 @@
+#!/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.
+#
+
+#
+# Pre Commit Hook for running tests and updating JIRA
+#
+# Original version was copied from FLUME project.
+#
+import sys, os, re, urllib2, base64, subprocess, tempfile, shutil
+import json
+from optparse import OptionParser
+
+tmp_dir = None
+BASE_JIRA_URL = 'https://issues.apache.org/jira'
+
+# Write output to file
+def write_file(filename, content):
+ with open(filename, "w") as text_file:
+ text_file.write(content)
+
+# Guess branch for given versions
+#
+# Return None if detects that JIRA belongs to more than one branch
+def sqoop_guess_branch(versions):
+ branch = None
+
+ for v in versions:
+ tmp_branch = None
+
+ if v.startswith("1.99") or v.startswith("2.0"):
+ tmp_branch = "sqoop"
+ else:
+ tmp_branch = "trunk"
+
+ if not branch:
+ branch = tmp_branch
+ else:
+ if branch != tmp_branch:
+ return None
+
+ return branch
+
+# Verify supported branch
+def sqoop_verify_branch(branch):
+ return branch in {"sqoop2", "SQOOP-1082"}
+
+def execute(cmd, log=True):
+ if log:
+ print "INFO: Executing %s" % (cmd)
+ return subprocess.call(cmd, shell=True)
+
+def jira_request(result, url, username, password, data, headers):
+ request = urllib2.Request(url, data, headers)
+ print "INFO: URL = %s, Username = %s, data = %s, headers = %s" % (url, username, data, str(headers))
+ if username and password:
+ base64string = base64.encodestring('%s:%s' % (username, password)).replace('\n', '')
+ request.add_header("Authorization", "Basic %s" % base64string)
+ return urllib2.urlopen(request)
+
+def jira_get_defect_html(result, defect, username, password):
+ url = "%s/browse/%s" % (BASE_JIRA_URL, defect)
+ return jira_request(result, url, username, password, None, {}).read()
+
+def jira_get_defect(result, defect, username, password):
+ url = "%s/rest/api/2/issue/%s" % (BASE_JIRA_URL, defect)
+ return jira_request(result, url, username, password, None, {}).read()
+
+def jira_generate_comment(result, branch):
+ body = [ "Here are the results of testing the latest attachment" ]
+ body += [ "%s against branch %s." % (result.attachment, branch) ]
+ body += [ "" ]
+ if result._fatal:
+ result._error = [ result._fatal ] + result._error
+ if result._error:
+ count = len(result._error)
+ if count == 1:
+ body += [ "{color:red}Overall:{color} -1 due to an error" ]
+ else:
+ body += [ "{color:red}Overall:{color} -1 due to %d errors" % (count) ]
+ else:
+ body += [ "{color:green}Overall:{color} +1 all checks pass" ]
+ body += [ "" ]
+ for error in result._error:
+ body += [ "{color:red}ERROR:{color} %s" % (error.replace("\n", "\\n")) ]
+ for info in result._info:
+ body += [ "INFO: %s" % (info.replace("\n", "\\n")) ]
+ for success in result._success:
+ body += [ "{color:green}SUCCESS:{color} %s" % (success.replace("\n", "\\n")) ]
+ if "BUILD_URL" in os.environ:
+ body += [ "" ]
+ body += [ "Console output: %sconsole" % (os.environ['BUILD_URL']) ]
+ body += [ "" ]
+ body += [ "This message is automatically generated." ]
+ return "\\n".join(body)
+
+def jira_post_comment(result, defect, branch, username, password):
+ url = "%s/rest/api/2/issue/%s/comment" % (BASE_JIRA_URL, defect)
+
+ # Generate body for the comment and save it to a file
+ body = jira_generate_comment(result, branch)
+ write_file("%s/jira-comment.txt" % output_dir, body.replace("\\n", "\n"))
+
+ # Send the comment to the JIRA
+ body = "{\"body\": \"%s\"}" % body
+ headers = {'Content-Type' : 'application/json'}
+ response = jira_request(result, url, username, password, body, headers)
+ body = response.read()
+ if response.code != 201:
+ msg = """Request for %s failed:
+ URL = '%s'
+ Code = '%d'
+ Comment = '%s'
+ Response = '%s'
+ """ % (defect, url, response.code, comment, body)
+ print "FATAL: %s" % (msg)
+ sys.exit(1)
+
+# hack (from hadoop) but REST api doesn't list attachments?
+def jira_get_attachment(result, defect, username, password):
+ html = jira_get_defect_html(result, defect, username, password)
+ pattern = "(/secure/attachment/[0-9]+/(bug)?%s[0-9\-]*\.(patch|txt|patch\.txt))" % (re.escape(defect))
+ matches = []
+ for match in re.findall(pattern, html, re.IGNORECASE):
+ matches += [ match[0] ]
+ if matches:
+ matches.sort()
+ return "%s%s" % (BASE_JIRA_URL, matches.pop())
+ return None
+
+# Get versions from JIRA JSON object
+def json_get_version(json):
+ versions = []
+ for version in json.get("fields").get("versions"):
+ versions = versions + [version.get("name")]
+ return versions
+
+def git_cleanup():
+ rc = execute("git clean -d -f", False)
+ if rc != 0:
+ print "ERROR: git clean failed"
+ rc = execute("git reset --hard HEAD", False)
+ if rc != 0:
+ print "ERROR: git reset failed"
+
+def git_checkout(result, branch):
+ if not branch:
+ result.fatal("Branch wasn't specified nor was correctly guessed")
+ return
+
+ if execute("git checkout %s" % (branch)) != 0:
+ result.fatal("git checkout %s failed" % branch)
+ if execute("git clean -d -f") != 0:
+ result.fatal("git clean failed")
+ if execute("git reset --hard HEAD") != 0:
+ result.fatal("git reset failed")
+ if execute("git fetch origin") != 0:
+ result.fatal("git fetch failed")
+ if execute("git merge --ff-only origin/sqoop2"):
+ result.fatal("git merge failed")
+
+def git_apply(result, cmd, patch_file, strip, output_dir):
+ output_file = "%s/apply.txt" % (output_dir)
+ rc = execute("%s -p%s < %s 1>%s 2>&1" % (cmd, strip, patch_file, output_file))
+ output = ""
+ if os.path.exists(output_file):
+ with open(output_file) as fh:
+ output = fh.read()
+ if rc == 0:
+ result.success("Patch applied correctly")
+ if output:
+ print output
+ else:
+ result.fatal("failed to apply patch (exit code %d):\n{code}%s{code}\n" % (rc, output))
+
+def mvn_clean(result, output_dir):
+ rc = execute("mvn clean 1>%s/clean.txt 2>&1" % output_dir)
+ if rc == 0:
+ result.success("Clean was successful")
+ else:
+ result.fatal("failed to clean project (exit code %d)" % (rc))
+
+def mvn_install(result, output_dir):
+ rc = execute("mvn install -DskipTests 1>%s/install.txt 2>&1" % output_dir)
+ if rc == 0:
+ result.success("Patch compiled")
+ else:
+ result.fatal("failed to build with patch (exit code %d)" % (rc))
+
+def find_all_files(top):
+ for root, dirs, files in os.walk(top):
+ for f in files:
+ yield os.path.join(root, f)
+
+def mvn_test(result, output_dir):
+ rc = execute("mvn test 1>%s/test.txt 2>&1" % output_dir)
+ if rc == 0:
+ result.success("All tests passed")
+ else:
+ result.error("mvn test exited %d" % (rc))
+ failed_tests = []
+ for path in list(find_all_files(".")):
+ file_name = os.path.basename(path)
+ if file_name.startswith("TEST-") and file_name.endswith(".xml"):
+ fd = open(path)
+ for line in fd:
+ if "<failure" in line or "<error" in line:
+ matcher = re.search("TEST\-(.*).xml$", file_name)
+ if matcher:
+ failed_tests += [ matcher.groups()[0] ]
+ fd.close()
+ for failed_test in failed_tests:
+ result.error("Failed: %s" % (failed_test))
+
+def clean_folder(folder):
+ for the_file in os.listdir(folder):
+ file_path = os.path.join(folder, the_file)
+ try:
+ if os.path.isfile(file_path):
+ os.unlink(file_path)
+ except Exception, e:
+ print e
+
+class Result(object):
+ def __init__(self):
+ self._error = []
+ self._info = []
+ self._success = []
+ self._fatal = None
+ self.exit_handler = None
+ self.attachment = "Not Found"
+ def error(self, msg):
+ self._error.append(msg)
+ def info(self, msg):
+ self._info.append(msg)
+ def success(self, msg):
+ self._success.append(msg)
+ def fatal(self, msg):
+ self._fatal = msg
+ self.exit_handler()
+ self.exit()
+ def exit(self):
+ git_cleanup()
+ if self._fatal or self._error:
+ if tmp_dir:
+ print "INFO: output is located %s" % (tmp_dir)
+ elif tmp_dir:
+ shutil.rmtree(tmp_dir)
+ sys.exit(0)
+
+usage = "usage: %prog [options]"
+parser = OptionParser(usage)
+parser.add_option("--branch", dest="branch",
+ help="Local git branch to test against", metavar="trunk")
+parser.add_option("--defect", dest="defect",
+ help="Defect name", metavar="FLUME-1787")
+parser.add_option("--file", dest="filename",
+ help="Test patch file", metavar="FILE")
+parser.add_option("--run-tests", dest="run_tests",
+ help="Run Tests", action="store_true")
+parser.add_option("--username", dest="username",
+ help="JIRA Username", metavar="USERNAME", default="flumeqa")
+parser.add_option("--output", dest="output_dir",
+ help="Directory to write output", metavar="DIRECTORY")
+parser.add_option("--post-results", dest="post_results",
+ help="Post results to JIRA (only works in defect mode)", action="store_true")
+parser.add_option("--password", dest="password",
+ help="JIRA Password", metavar="PASSWORD")
+parser.add_option("--patch-command", dest="patch_cmd", default="git apply",
+ help="Patch command such as `git apply' or `patch'", metavar="COMMAND")
+parser.add_option("-p", "--strip", dest="strip", default="1",
+ help="Remove <n> leading slashes from diff paths", metavar="N")
+
+(options, args) = parser.parse_args()
+if not (options.defect or options.filename):
+ print "FATAL: Either --defect or --file is required."
+ sys.exit(1)
+
+if options.defect and options.filename:
+ print "FATAL: Both --defect and --file cannot be specified."
+ sys.exit(1)
+
+if options.post_results and not options.password:
+ print "FATAL: --post-results requires --password"
+ sys.exit(1)
+
+branch = options.branch
+output_dir = options.output_dir
+defect = options.defect
+username = options.username
+password = options.password
+run_tests = options.run_tests
+post_results = options.post_results
+strip = options.strip
+patch_cmd = options.patch_cmd
+result = Result()
+
+if os.path.isdir(options.output_dir):
+ clean_folder(options.output_dir)
+
+# Default exit handler in case that we do not want to submit results to JIRA
+def log_and_exit():
+ # Write down comment generated for jira (won't be posted)
+ write_file("%s/jira-comment.txt" % output_dir, jira_generate_comment(result, branch).replace("\\n", "\n"))
+
+ if result._fatal:
+ print "FATAL: %s" % (result._fatal)
+ for error in result._error:
+ print "ERROR: %s" % (error)
+ for info in result._info:
+ print "INFO: %s" % (info)
+ for success in result._success:
+ print "SUCCESS: %s" % (success)
+ result.exit()
+
+result.exit_handler = log_and_exit
+
+if post_results:
+ def post_jira_comment_and_exit():
+ jira_post_comment(result, defect, branch, username, password)
+ result.exit()
+ result.exit_handler = post_jira_comment_and_exit
+
+if not output_dir:
+ tmp_dir = tempfile.mkdtemp()
+ output_dir = tmp_dir
+
+if output_dir.endswith("/"):
+ output_dir = output_dir[:-1]
+
+if options.output_dir and not os.path.isdir(options.output_dir):
+ os.makedirs(options.output_dir)
+
+# If defect parameter is specified let's download the latest attachment
+if defect:
+ print "Defect: %s" % defect
+ jira_json = jira_get_defect(result, defect, username, password)
+ json = json.loads(jira_json)
+
+ # JIRA must be in Patch Available state
+ if '"Patch Available"' not in jira_json:
+ print "ERROR: Defect %s not in patch available state" % (defect)
+ sys.exit(1)
+
+ # If branch is not specified, let's try to guess it from JIRA details
+ if not branch:
+ versions = json_get_version(json)
+ branch = sqoop_guess_branch(versions)
+ if not branch:
+ print "ERROR: Can't guess branch name from %s" % (versions)
+ sys.exit(1)
+
+ attachment = jira_get_attachment(result, defect, username, password)
+ if not attachment:
+ print "ERROR: No attachments found for %s" % (defect)
+ sys.exit(1)
+
+ result.attachment = attachment
+
+ patch_contents = jira_request(result, result.attachment, username, password, None, {}).read()
+ patch_file = "%s/%s.patch" % (output_dir, defect)
+
+ with open(patch_file, 'a') as fh:
+ fh.write(patch_contents)
+elif options.filename:
+ patch_file = options.filename
+else:
+ raise Exception("Not reachable")
+
+# Verify that we are on supported branch
+if not sqoop_verify_branch(branch):
+ print "ERROR: Unsupported branch %s" % (branch)
+ sys.exit(1)
+
+mvn_clean(result, output_dir)
+git_checkout(result, branch)
+git_apply(result, patch_cmd, patch_file, strip, output_dir)
+mvn_install(result, output_dir)
+if run_tests:
+ mvn_test(result, output_dir)
+else:
+ result.info("patch applied and built but tests did not execute")
+
+result.exit_handler()
http://git-wip-us.apache.org/repos/asf/sqoop/blob/fe54d473/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 43a84c4..8785e01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -454,6 +454,7 @@ limitations under the License.
<exclude>*.log</exclude>
<exclude>**/nb-configuration.xml</exclude>
<exclude>**.patch</exclude>
+ <exclude>patch-process/*</exclude>
</excludes>
</configuration>
</execution>