This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-10243 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10243 by this push: new 0adca89 IGNITE-10243: Support partially cancelled suites in RunAll 0adca89 is described below commit 0adca89f0bce7b3beb71defb95c267376d895023 Author: Dmitriy Pavlov <dpav...@apache.org> AuthorDate: Fri Nov 16 15:17:44 2018 +0300 IGNITE-10243: Support partially cancelled suites in RunAll --- .../src/main/java/org/apache/ignite/ci/TcHelper.java | 4 ++++ .../src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java index 41da43f..cd9db2b 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; import javax.inject.Inject; +import org.apache.ignite.ci.analysis.MultBuildRunCtx; import org.apache.ignite.ci.conf.BranchesTracked; import org.apache.ignite.ci.issue.IssueDetector; import org.apache.ignite.ci.issue.IssuesStorage; @@ -333,6 +334,9 @@ public class TcHelper implements ITcHelper, IJiraIntegration { if (suiteRes.contains(ProblemOccurrence.BUILD_FAILURE_ON_METRIC.toLowerCase())) failType = "build failure on metrics"; + if (suiteRes.contains(MultBuildRunCtx.CANCELLED.toLowerCase())) + failType = MultBuildRunCtx.CANCELLED.toLowerCase(); + if (failType == null) { List<TestFailure> failures = new ArrayList<>(); diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java index 50679a2..10b20fc 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/MultBuildRunCtx.java @@ -42,6 +42,9 @@ import java.util.stream.Stream; * Includes tests and problem occurrences; if logs processing is done also contains last started test */ public class MultBuildRunCtx implements ISuiteResults { + /** Cancelled. */ + public static final String CANCELLED = "CANCELLED"; + /** First build info. */ @Nonnull private final BuildRef firstBuildInfo; @@ -159,7 +162,7 @@ public class MultBuildRunCtx implements ISuiteResults { long cancelledCnt = buildsStream().filter(bCtx -> !bCtx.isComposite() && bCtx.isCancelled()).count(); if (cancelledCnt > 0) { - res.append("CANCELLED"); + res.append(CANCELLED); if (cancelledCnt > 1) res.append(" ").append(cancelledCnt);