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/20 19:10:47 UTC
[ignite-teamcity-bot] branch master updated: IGNITE-10336 Fix of
blockers count for current visa status
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
The following commit(s) were added to refs/heads/master by this push:
new 2fd8ce5 IGNITE-10336 Fix of blockers count for current visa status
2fd8ce5 is described below
commit 2fd8ce58c827cb3674133075473bc49802838027
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Nov 20 22:10:42 2018 +0300
IGNITE-10336 Fix of blockers count for current visa status
---
.../main/java/org/apache/ignite/ci/TcHelper.java | 10 ++++----
.../ignite/ci/tcbot/chain/PrChainsProcessor.java | 28 ++++++++++------------
.../tcbot/visa/TcBotTriggerAndSignOffService.java | 12 +++++++---
.../org/apache/ignite/ci/web/model/Version.java | 2 +-
4 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
index 7df5074..ae718cc 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
@@ -178,11 +178,13 @@ public class TcHelper implements ITcHelper, IJiraIntegration {
String comment = generateJiraComment(suitesStatuses, build.webUrl);
- blockers = suitesStatuses.stream().mapToInt(suite -> {
- if (suite.testFailures.isEmpty())
- return 1;
+ blockers = suitesStatuses.stream()
+ .mapToInt(suite -> {
+ if (suite.testFailures.isEmpty())
+ return 1;
- return suite.testFailures.size();})
+ return suite.testFailures.size();
+ })
.sum();
res = objectMapper.readValue(teamcity.sendJiraComment(ticket, comment), JiraCommentResponse.class);
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 588b218..4810a79 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
@@ -120,12 +120,11 @@ public class PrChainsProcessor {
else
logs = (checkAllLogs != null && checkAllLogs) ? ProcessLogsMode.ALL : ProcessLogsMode.SUITE_NOT_COMPLETE;
- List<Integer> hist = tcIgnited.getLastNBuildsFromHistory(suiteId,
- branchForTc, buildResMergeCnt);
+ List<Integer> hist = tcIgnited.getLastNBuildsFromHistory(suiteId, branchForTc, buildResMergeCnt);
String baseBranch = Strings.isNullOrEmpty(baseBranchForTc) ? ITeamcity.DEFAULT : baseBranchForTc;
- final FullChainRunCtx val = buildChainProcessor.loadFullChainContext(teamcity,
+ final FullChainRunCtx ctx = buildChainProcessor.loadFullChainContext(teamcity,
tcIgnited,
hist,
rebuild,
@@ -134,25 +133,21 @@ public class PrChainsProcessor {
baseBranch,
mode);
- Optional<FullChainRunCtx> pubCtx = Optional.of(val);
-
final ChainAtServerCurrentStatus chainStatus = new ChainAtServerCurrentStatus(teamcity.serverId(), branchForTc);
chainStatus.baseBranchForTc = baseBranch;
- pubCtx.ifPresent(ctx -> {
- if (ctx.isFakeStub())
- chainStatus.setBuildNotFound(true);
- else {
- int cnt0 = (int)ctx.getRunningUpdates().count();
+ if (ctx.isFakeStub())
+ chainStatus.setBuildNotFound(true);
+ else {
+ int cnt0 = (int)ctx.getRunningUpdates().count();
- if (cnt0 > 0)
- runningUpdates.addAndGet(cnt0);
+ if (cnt0 > 0)
+ runningUpdates.addAndGet(cnt0);
- //fail rate reference is always default (master)
- chainStatus.initFromContext(teamcity, ctx, teamcity, baseBranch);
- }
- });
+ //fail rate reference is always default (master)
+ chainStatus.initFromContext(teamcity, ctx, teamcity, baseBranch);
+ }
res.addChainOnServer(chainStatus);
@@ -187,6 +182,7 @@ public class PrChainsProcessor {
FullQueryParams.LATEST, null, null, false, queued);
boolean noBuilds = summary.servers.stream().anyMatch(s -> s.buildNotFound);
+
if(noBuilds)
return null;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java
index 312a033..d220d39 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java
@@ -434,11 +434,17 @@ public class TcBotTriggerAndSignOffService {
List<SuiteCurrentStatus> suitesStatuses
= prChainsProcessor.getSuitesStatuses(buildTypeId, tcBranch, srvId, prov, SyncMode.NONE);
- if(suitesStatuses==null)
+ if (suitesStatuses == null)
return status;
- status.blockers = suitesStatuses.stream().mapToInt(suite ->
- suite.testFailures.size()).sum();
+ status.blockers = suitesStatuses.stream()
+ .mapToInt(suite -> {
+ if (suite.testFailures.isEmpty())
+ return 1;
+
+ return suite.testFailures.size();
+ })
+ .sum();
return status;
}
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 3964e73..51ce92e 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
@@ -23,7 +23,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 = "20181119";
+ public static final String VERSION = "20181120";
/** TC Bot Version. */
public String version = VERSION;