You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/11/27 18:07:58 UTC
[ignite-teamcity-bot] branch ignite-9542-new-run-stripe updated:
IGNITE-9542 Disable new statistics from displaying
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9542-new-run-stripe
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-9542-new-run-stripe by this push:
new 21b4fcc IGNITE-9542 Disable new statistics from displaying
21b4fcc is described below
commit 21b4fcc7a22ccd6d227734957f12535cc22cc7ef
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Nov 27 21:07:57 2018 +0300
IGNITE-9542 Disable new statistics from displaying
---
.../main/java/org/apache/ignite/ci/ITcAnalytics.java | 1 +
.../ignite/ci/teamcity/ignited/runhist/RunHistSync.java | 8 ++++----
.../ignite/ci/web/model/current/SuiteCurrentStatus.java | 2 +-
.../ignite/ci/tcbot/chain/PrChainsProcessorTest.java | 17 +++++++++++------
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcAnalytics.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcAnalytics.java
index 9320610..dc67d30 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcAnalytics.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcAnalytics.java
@@ -39,6 +39,7 @@ public interface ITcAnalytics {
/**
* @return map from test full name (suite: suite.test) and its branch to its run statistics
*/
+ @Deprecated
Function<TestInBranch, RunStat> getTestRunStatProvider();
List<RunStat> topFailingSuite(int cnt);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java
index a14246f..d42ffce 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java
@@ -156,16 +156,16 @@ public class RunHistSync {
List<Integer> buildsIdsToLoad = new ArrayList<>();
int totalAskedToLoad = 0;
- for (int buildRefKey : buildRefKeys) {
- if (!fatBuildDao.containsKey(srvIdMaskHigh, buildRefKey))
- continue; // FAT Build not yet avaiable, skipping hist loading
+ for (int buildId : buildRefKeys) {
+ if (histDao.buildWasProcessed(srvIdMaskHigh, buildId))
+ continue;
if (buildsIdsToLoad.size() >= 100) {
totalAskedToLoad += buildsIdsToLoad.size();
scheduleHistLoad(srvId, buildsIdsToLoad);
buildsIdsToLoad.clear();
}
- buildsIdsToLoad.add(buildRefKey);
+ buildsIdsToLoad.add(buildId);
}
if (!buildsIdsToLoad.isEmpty()) {
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 3348e8d..ab724fc 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
@@ -52,7 +52,7 @@ import static org.apache.ignite.ci.util.UrlUtil.escape;
* Represent Suite result
*/
@SuppressWarnings("WeakerAccess") public class SuiteCurrentStatus extends FailureSummary {
- public static final boolean NEW_RUN_STAT = true;
+ public static final boolean NEW_RUN_STAT = false;
/** Suite Name */
public String name;
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 83250be..4bae79c 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
@@ -126,20 +126,25 @@ public class PrChainsProcessorTest {
assertTrue(blockers.stream().anyMatch(s -> "Build".equals(s.suiteId)));
assertTrue(blockers.stream().anyMatch(s -> "CancelledBuild".equals(s.suiteId)));
- assertFalse(blockers.stream().anyMatch(containsTestFail(TEST_WITH_HISTORY_FAILING_IN_MASTER)));
assertTrue(blockers.stream().anyMatch(containsTestFail(TEST_WITH_HISTORY_PASSING_IN_MASTER)));
- assertFalse(blockers.stream().anyMatch(containsTestFail(TEST_FLAKY_IN_MASTER)));
+
+ if (SuiteCurrentStatus.NEW_RUN_STAT) {
+ assertFalse(blockers.stream().anyMatch(containsTestFail(TEST_WITH_HISTORY_FAILING_IN_MASTER)));
+ assertFalse(blockers.stream().anyMatch(containsTestFail(TEST_FLAKY_IN_MASTER)));
+ }
Optional<SuiteCurrentStatus> suiteOpt = blockers.stream().filter(containsTestFail(TEST_WITH_HISTORY_PASSING_IN_MASTER)).findAny();
assertTrue(suiteOpt.isPresent());
Optional<TestFailure> testOpt = suiteOpt.get().testFailures.stream().filter(tf -> TEST_WITH_HISTORY_PASSING_IN_MASTER.equals(tf.name)).findAny();
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());
+ if (SuiteCurrentStatus.NEW_RUN_STAT) {
+ 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);
+ assertEquals(etalon, testOpt.get().histBaseBranch.latestRuns);
+ }
assertTrue(blockers.stream().anyMatch(containsTestFail(TEST_WAS_FIXED_IN_MASTER)));
if(SuiteCurrentStatus.NEW_RUN_STAT)