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/05/08 14:14:54 UTC
[ignite-teamcity-bot] branch ignite-10095 updated (6a7869a ->
564c186)
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a change to branch ignite-10095
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git.
from 6a7869a IGNITE-10095: Avoid saving particular Build Parameters
new 9d22dda IGNITE-10095: Support Build Parameters into run-history: Skeleton code
add 180bb2e More information about service failure, URL added
add 9a8ee82 Master Trends - suites from different servers (#123)
add fdf1e5b Version updated: Selection of more suites added for trends service; improved error handle
new 564c186 Merge branch 'master' into ignite-10095
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/ignite/ci/db/Persisted.java | 2 +-
.../ignited/fatbuild/FatBuildCompacted.java | 4 +++
.../ignited/fatbuild/PropertiesCompacted.java | 1 -
.../teamcity/ignited/fatbuild/TestCompacted.java | 14 +++++----
.../ci/teamcity/ignited/runhist/Invocation.java | 2 ++
.../teamcity/ignited/runhist/InvocationData.java | 2 ++
.../java/org/apache/ignite/ci/util/HttpUtil.java | 2 +-
.../org/apache/ignite/ci/web/model/Version.java | 2 +-
.../ignite/ci/web/model/hist/BuildsHistory.java | 22 ++++++++++-----
.../ignite/ci/web/rest/GetTrackedBranches.java | 2 +-
.../ci/web/rest/build/GetBuildTestFailures.java | 3 +-
.../src/main/webapp/comparison.html | 33 ++++++++++++++++------
.../ci/teamcity/ignited/TeamcityIgnitedMock.java | 6 ++--
13 files changed, 65 insertions(+), 30 deletions(-)
[ignite-teamcity-bot] 02/02: Merge branch 'master' into ignite-10095
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10095
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 564c1862a065b8b4c7e0141abc835a36d0e4507f
Merge: 9d22dda fdf1e5b
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Wed May 8 17:14:43 2019 +0300
Merge branch 'master' into ignite-10095
.../java/org/apache/ignite/ci/util/HttpUtil.java | 2 +-
.../org/apache/ignite/ci/web/model/Version.java | 2 +-
.../ignite/ci/web/model/hist/BuildsHistory.java | 22 ++++++++++-----
.../ignite/ci/web/rest/GetTrackedBranches.java | 2 +-
.../ci/web/rest/build/GetBuildTestFailures.java | 3 +-
.../src/main/webapp/comparison.html | 33 ++++++++++++++++------
6 files changed, 45 insertions(+), 19 deletions(-)
[ignite-teamcity-bot] 01/02: IGNITE-10095: Support Build Parameters
into run-history: Skeleton code
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10095
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 9d22ddacd7bd42622964925e40f1837a6845d12e
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue May 7 20:31:45 2019 +0300
IGNITE-10095: Support Build Parameters into run-history: Skeleton code
---
.../src/main/java/org/apache/ignite/ci/db/Persisted.java | 2 +-
.../ci/teamcity/ignited/fatbuild/FatBuildCompacted.java | 4 ++++
.../ci/teamcity/ignited/fatbuild/PropertiesCompacted.java | 1 -
.../ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java | 14 ++++++++------
.../ignite/ci/teamcity/ignited/runhist/Invocation.java | 2 ++
.../ignite/ci/teamcity/ignited/runhist/InvocationData.java | 2 ++
.../ignite/ci/teamcity/ignited/TeamcityIgnitedMock.java | 6 +++---
7 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Persisted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Persisted.java
index ec2e45c..ed5e251 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Persisted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Persisted.java
@@ -18,7 +18,7 @@
package org.apache.ignite.ci.db;
/**
- * Marker interface for object saved into cache
+ * Marker interface for objects saved into a cache.
*/
public @interface Persisted {
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
index e62632b..4b44d92 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
@@ -664,4 +664,8 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn
return Collections.unmodifiableList(Arrays.asList(revisions));
}
+
+ @Nullable public PropertiesCompacted parameters() {
+ return parameters;
+ }
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/PropertiesCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/PropertiesCompacted.java
index 1091966..e81096c 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/PropertiesCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/PropertiesCompacted.java
@@ -85,6 +85,5 @@ public class PropertiesCompacted {
consumer.accept(compactor.getStringFromId(nameid), compactor.getStringFromId(valId));
}
-
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java
index 07c49aa..62415cb 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java
@@ -367,16 +367,18 @@ public class TestCompacted {
public Invocation toInvocation(IStringCompactor compactor, FatBuildCompacted build) {
final boolean failedTest = isFailedTest(compactor);
-
final int failCode = failedTest
- ? (isIgnoredTest() || isMutedTest())
- ? InvocationData.MUTED
- : InvocationData.FAILURE
- : InvocationData.OK;
+ ? (isIgnoredTest() || isMutedTest())
+ ? InvocationData.MUTED
+ : InvocationData.FAILURE
+ : InvocationData.OK;
- return new Invocation(build.getId())
+ Invocation invocation = new Invocation(build.getId())
.withStatus(failCode)
.withStartDate(build.getStartDateTs())
.withChanges(build.changes());
+
+ return invocation;
+ // .withParameters(build.parameters().forEach(compactor, (k,v)->{}););
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
index d64b540..05e858f 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
@@ -20,10 +20,12 @@ package org.apache.ignite.ci.teamcity.ignited.runhist;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
+import org.apache.ignite.ci.db.Persisted;
/**
* Run history element: invocation of build or test.
*/
+@Persisted
public class Invocation {
/** VCS Change not filled. */
public static final int CHANGE_NOT_FILLED = 2;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
index 88ca10f..b6782c8 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/InvocationData.java
@@ -26,12 +26,14 @@ import java.util.TreeMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.ignite.ci.analysis.RunStat;
+import org.apache.ignite.ci.db.Persisted;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.NotNull;
/**
*
*/
+@Persisted
public class InvocationData {
/** Max days to keep test invocatoin data in run statistics: affects Bot Visa. */
public static final int MAX_DAYS = 21;
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 8006701..5cf9604 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
@@ -129,12 +129,12 @@ public class TeamcityIgnitedMock {
if (!build.isFinished(c))
continue;
- build.getAllTests().forEach(t -> {
- RunHistKey histKey = new RunHistKey(srvId, t.testName(), build.branchName());
+ build.getAllTests().forEach(testCompacted -> {
+ RunHistKey histKey = new RunHistKey(srvId, testCompacted.testName(), build.branchName());
final RunHistCompacted hist = histCache.computeIfAbsent(histKey, RunHistCompacted::new);
- Invocation inv = t.toInvocation(c, build);
+ Invocation inv = testCompacted.toInvocation(c, build);
hist.addInvocation(inv);
});