svn commit: r1595982 - in /hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution: JIRAService.java conf/TestConfiguration.java

[ha...@apache.org]

Author: hashutosh
Date: Mon May 19 18:01:21 2014
New Revision: 1595982

URL: http://svn.apache.org/r1595982
Log:
HIVE-7080 : In PTest framework, Add logs URL to the JIRA comment (Szehon Ho via Ashutosh Chauhan)

Modified:
    hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java
    hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java

Modified: hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java?rev=1595982&r1=1595981&r2=1595982&view=diff
==============================================================================
--- hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java (original)
+++ hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java Mon May 19 18:01:21 2014
@@ -69,6 +69,7 @@ class JIRAService {
   private final String mUser;
   private final String mPassword;
   private final String mJenkinsURL;
+  private final String mLogsURL;
 
   public JIRAService(Logger logger, TestConfiguration configuration, String buildTag) {
     mLogger = logger;
@@ -79,6 +80,7 @@ class JIRAService {
     mUser = configuration.getJiraUser();
     mPassword = configuration.getJiraPassword();
     mJenkinsURL = configuration.getJenkinsURL();
+    mLogsURL = configuration.getLogsURL();
   }
 
   void postComment(boolean error, int numTestsExecuted, SortedSet<String> failedTests,
@@ -86,6 +88,7 @@ class JIRAService {
     DefaultHttpClient httpClient = new DefaultHttpClient();
     try {
       String buildTag = formatBuildTag(mBuildTag);
+      String buildTagForLogs = formatBuildTagForLogs(mBuildTag);
       List<String> comments = Lists.newArrayList();
       comments.add("");
       comments.add("");
@@ -119,6 +122,7 @@ class JIRAService {
       }
       comments.add("Test results: " + mJenkinsURL + "/" + buildTag + "/testReport");
       comments.add("Console output: " + mJenkinsURL + "/" + buildTag + "/console");
+      comments.add("Test logs: " + mLogsURL + buildTagForLogs);
       comments.add("");
       if(!messages.isEmpty()) {
         comments.add("Messages:");
@@ -202,6 +206,13 @@ class JIRAService {
     }
     throw new IllegalArgumentException("Build tag '" + buildTag + "' must contain a -");
   }
+  static String formatBuildTagForLogs(String buildTag) {
+    if (buildTag.endsWith("/")) {
+      return buildTag;
+    } else {
+      return buildTag + "/";
+    }
+  }
   private static String formatError(String msg) {
     return String.format("{color:red}ERROR:{color} %s", msg);
   }
@@ -255,6 +266,7 @@ class JIRAService {
     context.put("repository", "repo");
     context.put("repositoryName", "repoName");
     context.put("antArgs", "-Dsome=thing");
+    context.put("logsURL", "http://ec2-174-129-184-35.compute-1.amazonaws.com/logs");
     TestConfiguration configuration = new TestConfiguration(new Context(context), logger);
     configuration.setJiraName("HIVE-4892");
     JIRAService service = new JIRAService(logger, configuration, "test-123");

Modified: hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java?rev=1595982&r1=1595981&r2=1595982&view=diff
==============================================================================
--- hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java (original)
+++ hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java Mon May 19 18:01:21 2014
@@ -55,9 +55,10 @@ public class TestConfiguration {
   private static final String JIRA_USER = "jiraUser";
   private static final String JIRA_PASSWORD = "jiraPassword";
   private static final String JENKINS_URL = "jenkinsURL";
+  private static final String LOGS_URL = "logsURL";
   private static final String TEST_CASE_PROPERTY_NAME = "testCasePropertyName";
   private static final String BUILD_TOOL = "buildTool";
-  
+
   private final Context context;
   private String antArgs;
   private String antTestArgs;
@@ -75,6 +76,7 @@ public class TestConfiguration {
   private String javaHomeForTests;
   private String branch;
   private final String jenkinsURL;
+  private final String logsURL;
   private final String jiraUrl;
   private final String jiraUser;
   private final String jiraPassword;
@@ -118,6 +120,7 @@ public class TestConfiguration {
     jiraUser = context.getString(JIRA_USER, "").trim();
     jiraPassword = context.getString(JIRA_PASSWORD, "").trim();
     jenkinsURL = context.getString(JENKINS_URL, "https://builds.apache.org/job").trim();
+    logsURL = context.getString(LOGS_URL, "").trim();
     testCasePropertyName = context.getString(TEST_CASE_PROPERTY_NAME, "testcase").trim();
   }
   public Context getContext() {
@@ -126,6 +129,9 @@ public class TestConfiguration {
   public String getJenkinsURL() {
     return jenkinsURL;
   }
+  public String getLogsURL() {
+    return logsURL;
+  }
   public String getJiraName() {
     return jiraName;
   }