You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pv...@apache.org on 2017/12/11 09:00:32 UTC
hive git commit: HIVE-18212: Make sure Yetus check always has a full
log (Adam Szita, via Peter Vary)
Repository: hive
Updated Branches:
refs/heads/master 390820971 -> f17c9b468
HIVE-18212: Make sure Yetus check always has a full log (Adam Szita, via Peter Vary)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f17c9b46
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f17c9b46
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f17c9b46
Branch: refs/heads/master
Commit: f17c9b46878523d2a3928b95299682dd1342d769
Parents: 3908209
Author: Peter Vary <pv...@cloudera.com>
Authored: Mon Dec 11 10:00:35 2017 +0100
Committer: Peter Vary <pv...@cloudera.com>
Committed: Mon Dec 11 10:00:35 2017 +0100
----------------------------------------------------------------------
.../apache/hive/ptest/execution/YetusPhase.java | 17 ++++++++++++++---
testutils/ptest2/src/main/resources/yetus-exec.vm | 2 +-
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/f17c9b46/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java
index 021646b..26545df 100644
--- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java
+++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java
@@ -46,6 +46,7 @@ public class YetusPhase extends Phase {
private final File mLogFile;
private final File mOutputDir;
private final File mScratchDir;
+ private final String buildTag;
private final String buildUrl;
private final TestConfiguration conf;
@@ -61,9 +62,17 @@ public class YetusPhase extends Phase {
this.mOutputDir = new File(logDir, YETUS_OUTPUT_FOLDER);
this.mScratchDir = scratchDir;
this.conf = configuration;
- this.buildUrl = conf.getLogsURL() + "/" + templateDefaults.get("buildTag") + "/";
+ this.buildTag = templateDefaults.get("buildTag");
+ this.buildUrl = conf.getLogsURL() + "/" + this.buildTag + "/";
+
}
+ /**
+ * This method will start a new thread to handle the Yetus test patch script execution.
+ * It creates a separate directory, instantiates the Yetus velocity template, runs it, and
+ * cleans it up after.
+ * @throws Exception
+ */
@Override
public void execute() throws Exception {
@@ -74,8 +83,9 @@ public class YetusPhase extends Phase {
if (!checkDependencies()) {
return;
}
-
- File yetusExecScript = new File(mScratchDir, YETUS_EXEC_SCRIPT);
+ File yetusScriptDir = new File(mScratchDir, buildTag);
+ yetusScriptDir.mkdir();
+ File yetusExecScript = new File(yetusScriptDir, YETUS_EXEC_SCRIPT);
Map<String, String> templateVars = new HashMap<>();
templateVars.putAll(getTemplateDefaults());
templateVars.put("workingDir", mWorkingDir.getAbsolutePath());
@@ -104,6 +114,7 @@ public class YetusPhase extends Phase {
logger.error("Error processing Yetus check", e);
} finally {
logger.debug("Deleting " + yetusExecScript + ": " + yetusExecScript.delete());
+ logger.debug("Deleting " + yetusScriptDir + ": " + yetusScriptDir.delete());
}
}
});
http://git-wip-us.apache.org/repos/asf/hive/blob/f17c9b46/testutils/ptest2/src/main/resources/yetus-exec.vm
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/main/resources/yetus-exec.vm b/testutils/ptest2/src/main/resources/yetus-exec.vm
index 9dea59e..847b9c6 100644
--- a/testutils/ptest2/src/main/resources/yetus-exec.vm
+++ b/testutils/ptest2/src/main/resources/yetus-exec.vm
@@ -23,6 +23,6 @@ export JIRA_ISSUE=${jiraName}
export JAVA_HOME=${javaHome}
./dev-support/test-patch.sh ${patchFile} --jenkins --jira-base-url=${jiraUrl} --jira-user=${jiraUser} \
--jira-password=${jiraPass} --patch-dir=${outputDir} --build-url=${buildUrl} --build-url-console=${buildUrlLog} \
- --build-url-artifacts=${buildUrlOutputDir} 2>&1 | tee ${logFile}
+ --build-url-artifacts=${buildUrlOutputDir} 2>&1 > ${logFile}
popd