This is an automated email from the ASF dual-hosted git repository. sk0x50 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 170c4c3 Changed rule for detecting critical suite failure. Fixes #174 170c4c3 is described below commit 170c4c3ea113fc02ff5113408e3f240f5b721d0e Author: sergeyuttsel <utt...@gmail.com> AuthorDate: Mon Sep 14 14:51:20 2020 +0300 Changed rule for detecting critical suite failure. Fixes #174 Signed-off-by: Slava Koptilin <slava.kopti...@gmail.com> --- .../org/apache/ignite/tcbot/engine/chain/ISuiteResults.java | 3 +++ .../org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java | 11 +++++------ .../apache/ignite/tcbot/engine/chain/SingleBuildRunCtx.java | 11 +++++------ .../org/apache/ignite/tcbot/engine/issue/EventTemplates.java | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/ISuiteResults.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/ISuiteResults.java index 8ef62f1..b051eb5 100644 --- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/ISuiteResults.java +++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/ISuiteResults.java @@ -42,6 +42,9 @@ interface ISuiteResults { /** */ public boolean hasBuildMessageProblem(); + /** */ + public boolean hasProblemNonByFailedTest(); + public String suiteId(); } diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java index dd639f9..c784065 100644 --- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java +++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java @@ -208,6 +208,10 @@ public class MultBuildRunCtx implements ISuiteResults { return getExitCodeProblemsCount() > 0; } + public boolean hasProblemNonByFailedTest() { + return buildsStream().anyMatch(SingleBuildRunCtx::hasProblemNonByFailedTest); + } + private long getExitCodeProblemsCount() { return buildsStream().filter(SingleBuildRunCtx::hasExitCodeProblem).count(); } @@ -594,12 +598,7 @@ public class MultBuildRunCtx implements ISuiteResults { } public boolean hasCriticalProblem() { - return hasJvmCrashProblem() - || hasTimeoutProblem() - || hasCompilationProblem() - || hasMetricProblem() - || hasExitCodeProblem() - || hasOomeProblem(); + return hasProblemNonByFailedTest(); } public int totalTests() { diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/SingleBuildRunCtx.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/SingleBuildRunCtx.java index 9252003..b1a8506 100644 --- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/SingleBuildRunCtx.java +++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/SingleBuildRunCtx.java @@ -118,6 +118,10 @@ public class SingleBuildRunCtx implements ISuiteResults { return getProblemsStream().anyMatch(p -> p.isExitCode(compactor)); } + @Override public boolean hasProblemNonByFailedTest() { + return getProblemsStream().anyMatch(p -> !p.isFailedTests(compactor)); + } + @Override public String suiteId() { return compactor.getStringFromId(buildCompacted.buildTypeId()); } @@ -325,12 +329,7 @@ public class SingleBuildRunCtx implements ISuiteResults { } public boolean hasSuiteIncompleteFailure() { - return hasJvmCrashProblem() - || hasTimeoutProblem() - || hasOomeProblem() - || hasExitCodeProblem() - || hasCompilationProblem() - || hasMetricProblem(); + return hasProblemNonByFailedTest(); } public int totalNotMutedTests() { diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/issue/EventTemplates.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/issue/EventTemplates.java index 415f481..4a45b2a 100644 --- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/issue/EventTemplates.java +++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/issue/EventTemplates.java @@ -39,8 +39,8 @@ public class EventTemplates { ); public static final EventTemplate newCriticalFailure = new EventTemplate( - new int[]{OK_OR_FAILURE, OK_OR_FAILURE, OK_OR_FAILURE, OK_OR_FAILURE, OK_OR_FAILURE}, - new int[]{CRITICAL_FAILURE, CRITICAL_FAILURE, CRITICAL_FAILURE, CRITICAL_FAILURE} + new int[]{OK_OR_FAILURE}, + new int[]{CRITICAL_FAILURE, CRITICAL_FAILURE, CRITICAL_FAILURE} ); public static final EventTemplate newContributedTestFailure = new EventTemplate(