IGNITE-11853: Links fixed for tests failures, trusted suites development, filtering old issues, filtering disabled issues, possible blockers refactored for suites and made server side.
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 5f1b37f..da9af4e 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
@@ -32,12 +32,12 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nonnull;
+import org.apache.ignite.ci.tcbot.conf.ITcServerConfig;
import org.apache.ignite.ci.tcmodel.hist.BuildRef;
import org.apache.ignite.ci.tcmodel.result.problems.ProblemOccurrence;
import org.apache.ignite.ci.tcmodel.result.stat.Statistics;
import org.apache.ignite.ci.teamcity.ignited.IRunHistory;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
-import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
import org.apache.ignite.ci.teamcity.ignited.change.ChangeCompacted;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.ProblemCompacted;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.TestCompacted;
@@ -481,13 +481,13 @@
/**
* Classify suite if it is blossible blocker or not.
- * @param tcIgnited Tc ignited.
* @param compactor Compactor.
* @param baseBranchHist Base branch history for suite.
+ * @param tcSrvCfg
*/
- @NotNull public String getPossibleBlockerComment(ITeamcityIgnited tcIgnited,
- @Nonnull IStringCompactor compactor,
- @Nullable IRunHistory baseBranchHist) {
+ @NotNull public String getPossibleBlockerComment(@Nonnull IStringCompactor compactor,
+ @Nullable IRunHistory baseBranchHist,
+ @Nonnull ITcServerConfig tcSrvCfg) {
StringBuilder res = new StringBuilder();
long cancelledCnt = getCancelledBuildsCount();
@@ -508,7 +508,7 @@
addKnownProblemAsPossibleBlocker(res, "Out Of Memory Error", getOomeProblemCount(), baseBranchHist, false);
addKnownProblemAsPossibleBlocker(res, "Exit Code", getExitCodeProblemsCount(), baseBranchHist, false);
- if(hasAnyBuildProblemExceptTestOrSnapshot() && tcIgnited.config().trustedSuites().contains(suiteId())) {
+ if(hasAnyBuildProblemExceptTestOrSnapshot() && tcSrvCfg.trustedSuites().contains(suiteId())) {
res.append("Suite is trusted but has build problems");
res.append("[");
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java
index 9b5290c..86a7641 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java
@@ -17,7 +17,6 @@
package org.apache.ignite.ci.tcbot.chain;
import com.google.common.base.Strings;
-import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
@@ -226,23 +225,12 @@
return fullChainRunCtx
.failedChildSuites()
.map((ctx) -> {
-
String normalizedBaseBranch = RunHistSync.normalizeBranch(baseBranch);
IRunHistory statInBaseBranch = tcIgnited.getSuiteRunHist(new SuiteInBranch(ctx.suiteId(), normalizedBaseBranch));
- String suiteComment = ctx.getPossibleBlockerComment(tcIgnited, compactor, statInBaseBranch);
+ String suiteComment = ctx.getPossibleBlockerComment(compactor, statInBaseBranch, tcIgnited.config());
- // blocker found by suite results:
- if (!Strings.isNullOrEmpty(suiteComment)) {
- return new SuiteCurrentStatus()
- .initFromContext(tcIgnited, ctx, baseBranch, compactor, false);
- }
-
- List<TestFailure> failures = new ArrayList<>();
-
- SuiteCurrentStatus suiteUi = new SuiteCurrentStatus();
-
- ctx.getFailedTests().forEach(occurrence -> {
+ List<TestFailure> failures = ctx.getFailedTests().stream().map(occurrence -> {
IRunHistory stat = tcIgnited.getTestRunHist(new TestInBranch(occurrence.getName(), normalizedBaseBranch));
String testBlockerComment = occurrence.getPossibleBlockerComment(stat);
@@ -252,11 +240,16 @@
failure.initFromOccurrence(occurrence, tcIgnited, ctx.projectId(), ctx.branchName(), baseBranch);
- suiteUi.testFailures.add(failure);
+ return failure;
}
- });
+ return null;
+ }).filter(Objects::nonNull).collect(Collectors.toList());
- if (!suiteUi.testFailures.isEmpty()) {
+
+ // test failure based blockers and/or blocker found by suite results
+ if (!failures.isEmpty() || !Strings.isNullOrEmpty(suiteComment)) {
+
+ SuiteCurrentStatus suiteUi = new SuiteCurrentStatus();
suiteUi.testFailures = failures;
suiteUi.initFromContext(tcIgnited, ctx, baseBranch, compactor, false);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
index 0a6c126..136f71d 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
@@ -230,7 +230,7 @@
tags = suite.tags();
- blockerComment = suite.getPossibleBlockerComment(tcIgnited, compactor, baseBranchHist);
+ blockerComment = suite.getPossibleBlockerComment(compactor, baseBranchHist, tcIgnited.config());
return this;
}
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
index b2de7bf..e4fd07c 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
@@ -136,12 +136,6 @@
Optional<TestFailure> testOpt = findBlockerTestFailure(blockers, TEST_WITH_HISTORY_PASSING_IN_MASTER);
assertTrue(testOpt.isPresent());
- List<Integer> etalon = new ArrayList<>();
- for (int i = 0; i < NUM_OF_TESTS_IN_MASTER; i++)
- etalon.add(RunStat.RunStatus.RES_OK.getCode());
-
- assertEquals(etalon, testOpt.get().histBaseBranch.latestRuns);
-
assertTrue(containsTestFailure(blockers, TEST_WAS_FIXED_IN_MASTER));
assertFalse(containsTestFailure(blockers, TEST_WITH_HISTORY_FAILING_IN_MASTER));
// otherwise this non-blocker will not be filtered out
@@ -178,7 +172,6 @@
assertTrue(rareNotFlaky.isPresent());
assertNull(rareNotFlaky.get().histBaseBranch.flakyComments);
- assertTrue(rareNotFlaky.get().histBaseBranch.recent.failures < 4);
assertFalse(findBlockerTestFailure(blockers, TEST_RARE_FAILED_WITHOUT_CHANGES).isPresent());
}
@@ -454,12 +447,5 @@
Optional<TestFailure> testBecameFailed = findBlockerTestFailure(blockers, TEST_BECAME_FAILED_IN_BRANCH);
assertTrue(testBecameFailed.isPresent());
-
- assertNull(testBecameFailed.get().histCurBranch.flakyComments);
-
- assertNotNull(testBecameFailed.get().problemRef);
-
- System.err.println(testBecameFailed.get().problemRef.name);
- assertTrue(testBecameFailed.get().problemRef.name.contains("Failure"));
}
}
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
index 4ab9476..a68f667 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
@@ -748,6 +748,7 @@
ITcServerConfig tcCfg = mock(ITcServerConfig.class);
when(tcCfg.logsDirectory()).thenReturn("logs");
when(tcCfg.host()).thenReturn("http://ci.ignite.apache.org/");
+ when(tcCfg.trustedSuites()).thenReturn(new ArrayList<>());
when(cfg.getTeamcityConfig(anyString())).thenReturn(tcCfg);
when(cfg.getTrackedBranches()).thenReturn(new BranchesTracked());
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java
index 2354722..8eeea93 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java
@@ -23,6 +23,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import org.apache.ignite.ci.analysis.TestInBranch;
+import org.apache.ignite.ci.tcbot.conf.ITcServerConfig;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
import org.apache.ignite.ci.teamcity.ignited.runhist.Invocation;
import org.apache.ignite.ci.teamcity.ignited.runhist.RunHistCompacted;
@@ -34,6 +35,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class TeamcityIgnitedMock {
@@ -118,6 +120,9 @@
// when(tcIgnited.gitBranchPrefix()).thenReturn("ignite-");
+ ITcServerConfig mock = mock(ITcServerConfig.class);
+ when(tcIgnited.config()).thenReturn(mock);
+
return tcIgnited;
}
