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 18:39:00 UTC
[ignite-teamcity-bot] branch master updated (b02303f -> a9a276e)
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git.
from b02303f IGNITE-10095: Support Build Parameters specifying in triggering and tagging builds (#122)
new 6f332cd IGNITE-10095: Support Build Parameters specifying: bugfixing
new a9a276e IGNITE-10095: Support Build Parameters specifying: bugfixing
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:
.../teamcity/ignited/fatbuild/FatBuildCompacted.java | 20 ++++++++++++++++++--
.../ci/teamcity/ignited/fatbuild/TestCompacted.java | 7 ++++++-
.../ci/teamcity/ignited/runhist/RunHistSync.java | 8 +++++---
.../java/org/apache/ignite/ci/web/model/Version.java | 2 +-
.../ignited/IgnitedTcInMemoryIntegrationTest.java | 2 ++
5 files changed, 32 insertions(+), 7 deletions(-)
[ignite-teamcity-bot] 01/02: IGNITE-10095: Support Build Parameters
specifying: bugfixing
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 6f332cd083320af5f550277966481d0d0d5fe40a
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Wed May 8 21:31:18 2019 +0300
IGNITE-10095: Support Build Parameters specifying: bugfixing
---
.../teamcity/ignited/fatbuild/FatBuildCompacted.java | 20 ++++++++++++++++++--
.../ci/teamcity/ignited/fatbuild/TestCompacted.java | 7 ++++++-
.../ci/teamcity/ignited/runhist/RunHistSync.java | 6 ++++--
.../java/org/apache/ignite/ci/web/model/Version.java | 2 +-
4 files changed, 29 insertions(+), 6 deletions(-)
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 7bfa146..2edfc4d 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
@@ -25,7 +25,9 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BiPredicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.ignite.ci.ITeamcity;
@@ -619,7 +621,8 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn
.toString();
}
- public Invocation toInvocation(IStringCompactor compactor) {
+ public Invocation toInvocation(IStringCompactor compactor,
+ BiPredicate<Integer, Integer> paramsFilter) {
boolean success = isSuccess(compactor);
final int failCode ;
@@ -639,10 +642,23 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn
}
- return new Invocation(getId())
+ Invocation invocation = new Invocation(getId())
.withStatus(failCode)
.withStartDate(getStartDateTs())
.withChanges(changes());
+
+ java.util.Map<Integer, Integer> importantParms = new TreeMap<>();
+
+ ParametersCompacted parameters = this.parameters();
+ if (parameters == null)
+ return invocation;
+
+ parameters.forEach((k, v) -> {
+ if (paramsFilter.test(k, v))
+ importantParms.put(k, v);
+ });
+
+ return invocation;
}
public void setVersion(short ver) {
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 11a2502..cf5fca5 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
@@ -33,6 +33,7 @@ import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrence;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrenceFull;
import org.apache.ignite.ci.tcmodel.result.tests.TestRef;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
+import org.apache.ignite.ci.teamcity.ignited.buildtype.ParametersCompacted;
import org.apache.ignite.ci.teamcity.ignited.runhist.Invocation;
import org.apache.ignite.ci.teamcity.ignited.runhist.InvocationData;
import org.jetbrains.annotations.Nullable;
@@ -390,7 +391,11 @@ public class TestCompacted {
java.util.Map<Integer, Integer> importantParms = new TreeMap<>();
- build.parameters().forEach((k, v) -> {
+ ParametersCompacted parameters = build.parameters();
+ if (parameters == null)
+ return invocation;
+
+ parameters.forEach((k, v) -> {
if (paramsFilter.test(k, v))
importantParms.put(k, v);
});
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 d5f804d..bc18ed8 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
@@ -29,6 +29,7 @@ import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiPredicate;
import java.util.stream.Collectors;
import javax.annotation.concurrent.GuardedBy;
import javax.inject.Inject;
@@ -109,6 +110,7 @@ public class RunHistSync {
Set<Integer> allTriggeringBuildParameters = getFilteringParameters(srvCode);
+ BiPredicate<Integer, Integer> parmFilter = (k, v) -> allTriggeringBuildParameters.contains(k);
boolean saveNow = false;
int branchNameNormalized = compactor.getStringId(normalizeBranch(build.branchName(compactor)));
@@ -118,13 +120,13 @@ public class RunHistSync {
build.getAllTests().forEach(t -> {
RunHistKey histKey = new RunHistKey(srvId, t.testName(), branchNameNormalized);
List<Invocation> list = testInvMap.computeIfAbsent(histKey, k -> new ArrayList<>());
- list.add(t.toInvocation(compactor, build, (k, v) -> allTriggeringBuildParameters.contains(k)));
+ list.add(t.toInvocation(compactor, build, parmFilter));
cntTests.incrementAndGet();
});
RunHistKey buildInvKey = new RunHistKey(srvId, build.buildTypeId(), branchNameNormalized);
- Invocation buildInv = build.toInvocation(compactor);
+ Invocation buildInv = build.toInvocation(compactor, parmFilter);
int cnt = cntTests.get();
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index 618bb7c..5c62d93 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -28,7 +28,7 @@ package org.apache.ignite.ci.web.model;
public static final String GITHUB_REF = "https://github.com/apache/ignite-teamcity-bot";
/** TC Bot Version. */
- public static final String VERSION = "20190507";
+ public static final String VERSION = "20190508";
/** Java version, where Web App is running. */
public String javaVer;
[ignite-teamcity-bot] 02/02: IGNITE-10095: Support Build Parameters
specifying: bugfixing
Posted by dp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit a9a276eb30bf4ee4d38b41e36778f5d6ab3afa33
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Wed May 8 21:38:54 2019 +0300
IGNITE-10095: Support Build Parameters specifying: bugfixing
---
.../java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistSync.java | 2 +-
.../ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
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 bc18ed8..b0662cd 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
@@ -155,7 +155,7 @@ public class RunHistSync {
}
@NotNull public Set<Integer> getFilteringParameters(String srvCode) {
- Set<String> triggerParameters = this.cfg.getTrackedBranches().getBranches().stream().flatMap(
+ Set<String> triggerParameters = cfg.getTrackedBranches().getBranches().stream().flatMap(
b -> b.getChainsStream()
.filter(ChainAtServerTracked::isTriggerBuild)
.filter(chain -> Objects.equals(chain.getServerId(), srvCode))
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 daa7b77..4ab9476 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
@@ -48,6 +48,7 @@ import org.apache.ignite.ci.di.scheduler.DirectExecNoWaitScheduler;
import org.apache.ignite.ci.di.scheduler.IScheduler;
import org.apache.ignite.ci.jira.pure.IJiraIntegrationProvider;
import org.apache.ignite.ci.tcbot.chain.PrChainsProcessorTest;
+import org.apache.ignite.ci.tcbot.conf.BranchesTracked;
import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.tcbot.conf.ITcServerConfig;
import org.apache.ignite.ci.tcmodel.changes.ChangesList;
@@ -748,6 +749,7 @@ public class IgnitedTcInMemoryIntegrationTest {
when(tcCfg.logsDirectory()).thenReturn("logs");
when(tcCfg.host()).thenReturn("http://ci.ignite.apache.org/");
when(cfg.getTeamcityConfig(anyString())).thenReturn(tcCfg);
+ when(cfg.getTrackedBranches()).thenReturn(new BranchesTracked());
bind(ITcBotConfig.class).toInstance(cfg);
}