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 2019/08/05 14:21:01 UTC
[ignite-teamcity-bot] 01/02: Merge branch 'master' into
newtest-detection-fix
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch newtest-detection-fix
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 5082183bac7c731c852e54e03b2fc5d37f1614b5
Merge: ecf7b20 63a478c
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Mon Aug 5 17:19:24 2019 +0300
Merge branch 'master' into newtest-detection-fix
# Conflicts:
# tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
# tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
.../ignite/ci/tcbot/issue/IssueDetector.java | 2 +-
.../org/apache/ignite/ci/web/model/Version.java | 2 +-
.../ignite/ci/web/rest/GetChainResultsAsHtml.java | 2 +-
.../ci/web/rest/build/GetBuildTestFailures.java | 2 +-
ignite-tc-helper-web/src/main/webapp/current.html | 20 +++---
.../ci/teamcity/ignited/TeamcityIgnitedMock.java | 2 +-
.../IgnitedTcInMemoryIntegrationTest.java | 3 -
.../tcbot/engine/chain/BuildChainProcessor.java | 25 ++-----
.../ignite/tcbot/engine/chain/MultBuildRunCtx.java | 33 ++++++----
.../tcbot/engine/chain/TestCompactedMult.java | 22 +++++--
.../ignite/tcbot/engine/pr/PrChainsProcessor.java | 9 +--
.../tracked/TrackedBranchChainsProcessor.java | 3 +-
.../apache/ignite/tcbot/engine/ui/DsChainUi.java | 24 ++++---
.../apache/ignite/tcbot/engine/ui/DsSuiteUi.java | 64 +++++++++---------
.../ignite/tcbot/engine/ui/DsTestFailureUi.java | 36 +++++++---
.../ignited/buildtype/ParametersCompacted.java | 25 +++++--
.../ignited/fatbuild/FatBuildCompacted.java | 14 +++-
.../ci/teamcity/ignited/runhist/Invocation.java | 28 +++++++-
.../teamcity/ignited/runhist/InvocationData.java | 4 +-
.../teamcity/ignited/runhist/RunHistCompacted.java | 34 +++++++++-
.../ignite/tcignited/TeamcityIgnitedImpl.java | 14 +++-
.../ignite/tcignited/TeamcityIgnitedModule.java | 2 -
.../tcignited/build/ProactiveFatBuildSync.java | 4 --
.../ignite/tcignited/build/SuiteHistory.java | 16 +++++
.../ignite/tcignited/build/TestCompactedV2.java | 28 ++------
.../tcignited/buildref/BranchEquivalence.java | 17 +++++
.../ignite/tcignited/history/HistoryCollector.java | 64 +++++++++++-------
.../ignite/tcignited/history/IRunHistory.java | 3 +
.../ignite/tcignited/history/ISuiteRunHistory.java | 4 ++
.../ignite/tcignited/history/RunHistSync.java | 77 ----------------------
.../ignite/tcignited/history/SuiteInvocation.java | 23 ++++++-
.../history/SuiteInvocationHistoryDao.java | 19 ++++--
32 files changed, 363 insertions(+), 262 deletions(-)
diff --cc tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
index e5b72a2,f973c07..2591588
--- a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
+++ b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
@@@ -126,17 -115,7 +126,17 @@@ public class InvocationData
invocationList.sort(Comparator.comparing(Invocation::buildId));
}
- Set<Integer> getBuildIds() {
- return invocations().map(Invocation::buildId).collect(Collectors.toSet());
+ public Set<Integer> buildIds() {
+ return invocationList.stream().map(Invocation::buildId).collect(Collectors.toSet());
}
+
+ public void registerMissing(Integer testId, Set<Integer> suiteBuildIds) {
+ Set<Integer> idsPresent = getBuildIds();
+ HashSet<Integer> toAdd = new HashSet<>(suiteBuildIds);
+ toAdd.removeAll(idsPresent);
+
+ toAdd.forEach(id -> {
+ add(new Invocation(id).withStatus(MISSING));
+ });
+ }
}
diff --cc tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
index 23c01be,722ff7a..ba56d3b
--- a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
+++ b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
@@@ -26,11 -26,11 +26,18 @@@ import org.apache.ignite.tcignited.hist
import javax.annotation.Nullable;
import java.util.List;
+ import java.util.Map;
+ import java.util.Objects;
+ import java.util.Set;
+ import java.util.stream.Collectors;
+
++import javax.annotation.Nullable;
++import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
/**
*
*/
@@@ -211,11 -206,23 +223,31 @@@ public class RunHistCompacted implement
data.sort();
}
+ public Set<Integer> buildIds() {
+ return data.getBuildIds();
+ }
+
+ public void registerMissing(Integer testId, Set<Integer> buildIds) {
+ data.registerMissing(testId, buildIds);
+ }
++
+ public RunHistCompacted filterSuiteInvByParms(Map<Integer, Integer> requireParameters) {
+ RunHistCompacted copy = new RunHistCompacted();
+
+ data.invocations()
- .filter(invocation -> invocation.containsParameterValue(requireParameters))
- .forEach(invocation -> copy.data.add(invocation));
++ .filter(invocation -> invocation.containsParameterValue(requireParameters))
++ .forEach(invocation -> copy.data.add(invocation));
+
+ return copy;
+ }
+
+ public RunHistCompacted filterByBuilds(Set<Integer> builds) {
+ RunHistCompacted copy = new RunHistCompacted();
+
+ data.invocations()
- .filter(invocation -> builds.contains(invocation.buildId()))
- .forEach(invocation -> copy.data.add(invocation));
++ .filter(invocation -> builds.contains(invocation.buildId()))
++ .forEach(invocation -> copy.data.add(invocation));
+
+ return copy;
+ }
}
diff --cc tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/SuiteHistory.java
index f458cca,7d1b24f..bdb0a13
--- a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/SuiteHistory.java
+++ b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/tcignited/build/SuiteHistory.java
@@@ -42,8 -43,11 +43,10 @@@ public class SuiteHistory implements IS
finalizeInvocations();
}
+ private SuiteHistory() {}
+
private void finalizeInvocations() {
- //todo add missing status to tests
- // testsHistory.values().registerMissing(suiteHist.buildIds());
+ testsHistory.forEach((k, t)->t.registerMissing(k, suiteHist.buildIds()));
suiteHist.sort();
testsHistory.values().forEach(RunHistCompacted::sort);