This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 24b4b8c Notifications changes, version output
24b4b8c is described below
commit 24b4b8c866e6ec14ef4b21ebad766c199145e9c2
Author: Dmitriy Pavlov <dpav...@apache.org>
AuthorDate: Sat Sep 22 16:44:57 2018 +0300
Notifications changes, version output
---
.../main/java/org/apache/ignite/ci/db/TcHelperDb.java | 7 ++++---
.../java/org/apache/ignite/ci/issue/IssueDetector.java | 13 +++++++------
.../java/org/apache/ignite/ci/issue/Notification.java | 18 +++++++++++-------
.../java/org/apache/ignite/ci/web/model/Version.java | 6 ++++--
4 files changed, 26 insertions(+), 18 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
index 723c699..9acc3e2 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
@@ -27,6 +27,7 @@ import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.ci.HelperConfig;
+import org.apache.ignite.ci.web.model.Version;
import org.apache.ignite.configuration.*;
import org.apache.ignite.logger.slf4j.Slf4jLogger;
import org.apache.ignite.spi.IgniteSpiContext;
@@ -49,7 +50,7 @@ public class TcHelperDb {
public static void main(String[] args) {
Ignite ignite = start();
- System.out.println("Starting Ignite DB only");
+ System.out.println("Starting Ignite DB only, " + Version.VERSION);
Runnable r = () -> {
boolean stop = waitStopSignal();
@@ -86,11 +87,11 @@ public class TcHelperDb {
cfg.setDataStorageConfiguration(dsCfg);
- System.out.println("Starting Ignite Server Node");
+ System.out.println("Starting Ignite Server Node, " + Version.VERSION);
final Ignite ignite = Ignition.start(cfg);
- System.out.println("Activating Ignite Server Node");
+ System.out.println("Activating Ignite Server Node, " +
Version.VERSION);
ignite.cluster().active(true);
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java
index d4745fd..eb15050 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java
@@ -285,25 +285,25 @@ public class IssueDetector {
if (runStat == null)
return false;
- RunStat.TestId firstFailedTestId = null;
+ RunStat.TestId firstFailedTestId;
String displayType = null;
- if (firstFailedTestId == null) {
- firstFailedTestId =
runStat.detectTemplate(EventTemplates.newContributedTestFailure);
+ firstFailedTestId =
runStat.detectTemplate(EventTemplates.newContributedTestFailure);
+
+ if (firstFailedTestId != null)
displayType = "Recently contributed test failed";
- }
if (firstFailedTestId == null) {
firstFailedTestId =
runStat.detectTemplate(EventTemplates.newFailure);
- displayType = "New test failure";
if (firstFailedTestId != null) {
+ displayType = "New test failure";
final String flakyComments = runStat.getFlakyComments();
if (!Strings.isNullOrEmpty(flakyComments)) {
if
(runStat.detectTemplate(EventTemplates.newFailureForFlakyTest) == null) {
logger.info("Skipping registering new issue for test
fail:" +
- " Test seems to be flaky " + name + ": " +
flakyComments);
+ " Test seems to be flaky " + name + ": " +
flakyComments);
firstFailedTestId = null;
} else
@@ -316,6 +316,7 @@ public class IssueDetector {
return false;
int buildId = firstFailedTestId.getBuildId();
+
IssueKey issueKey = new IssueKey(srvId, buildId, name);
if (issuesStorage.cache().containsKey(issueKey))
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Notification.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Notification.java
index 4d94ddd..a7ea15c 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Notification.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Notification.java
@@ -20,6 +20,8 @@ package org.apache.ignite.ci.issue;
import java.util.*;
import org.apache.ignite.ci.web.model.Version;
+import static org.apache.ignite.ci.web.model.Version.GITHUB_REF;
+
public class Notification {
private static final String DETECTED_ISSUE = "I've detected some new issue
on TeamCity to be handled. " +
"You are more than welcomed to help.";
@@ -104,14 +106,14 @@ public class Notification {
return "Hi Igniters,<br><br>" +
" " + DETECTED_ISSUE + "<br><br>" +
" " + IF_YOUR_CHANGES + "<br>" +
- " " + YOUR_ACTION + "<br>";
+ " " + YOUR_ACTION + "<br><br>";
}
private String messageHeaderPlainText() {
return "Hi Igniters,\n\n" +
" " + DETECTED_ISSUE + "\n\n" +
" " + IF_YOUR_CHANGES + "\n" +
- " " + YOUR_ACTION + "\n";
+ " " + YOUR_ACTION + "\n\n";
}
@@ -119,17 +121,19 @@ public class Notification {
return "\t - Here's a reminder of what contributors were agreed to do
" +
HTC_REF + " \n" +
"\t - Should you have any questions please contact " +
Version.DEFAULT_CONTACT + " \n\n" +
- "Best Regards,\nApache Ignite TeamCity Bot \n" +
+ "Best Regards,\n" +
+ "Apache Ignite TeamCity Bot \n" +
+ GITHUB_REF + "\n" +
"Notification generated at " + new Date(ts).toString() + " \n";
}
private String messageTailHtml() {
return "<ul><li>Here's a reminder of what contributors were agreed to
do " +
- "<a href='" + HTC_REF + "'>How to contribute</a>." + "</li>"
+
+ "<a href='" + HTC_REF + "'>How to Contribute</a>." + "</li>" +
"<li>Should you have any questions please contact " +
Version.DEFAULT_CONTACT + " </li></ul><br>" +
-
- "Best Regards,<br>Apache Ignite TeamCity Bot<br>" +
- "Notification generated at " + new Date(ts).toString() + "<br>";
+ "Best Regards,<br>" +
+ "<a href='" + GITHUB_REF + "'>Apache Ignite TeamCity
Bot<a><br>" +
+ "Notification generated at " + new Date(ts).toString() +
"<br>";
}
public String countIssues() {
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index c1082a9..041bbd1 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -20,9 +20,11 @@ package org.apache.ignite.ci.web.model;
@SuppressWarnings("PublicField") public class Version {
/** Default contact. */
public static final String DEFAULT_CONTACT = "d...@ignite.apache.org";
+ public static final String GITHUB_REF =
"https://github.com/apache/ignite-teamcity-bot";;
+ public static final String VERSION = "20180921";
/** TC Helper Version. */
- public String version = "20180921";
+ public String version = VERSION;
/** Ignite version. */
public String ignVer;
@@ -31,7 +33,7 @@ package org.apache.ignite.ci.web.model;
public String ignVerFull;
/** TC Helper GitHub Mirror. */
- public String srcWebUrl = "https://github.com/apache/ignite-teamcity-bot";;
+ public String srcWebUrl = GITHUB_REF;
/** TC Helper GitHub Mirror. */
public String gitHubMirror = srcWebUrl;
