[ignite-teamcity-bot] branch ignite-gg-14609 updated: IGNITE-GG-14609: Filtering correct server projects

[dpavlov]

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch ignite-gg-14609
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git


The following commit(s) were added to refs/heads/ignite-gg-14609 by this push:
     new 09b05fc  IGNITE-GG-14609: Filtering correct server projects
09b05fc is described below

commit 09b05fc43c8ae7ee03b33732dddf9d6d6aa8073b
Author: Dmitriy Pavlov <dpav...@apache.org>
AuthorDate: Thu Jan 10 17:29:45 2019 +0300

    IGNITE-GG-14609: Filtering correct server projects
---
 .../ci/tcbot/visa/TcBotTriggerAndSignOffService.java  | 19 +++++++++++--------
 .../ignite/ci/web/model/current/UpdateInfo.java       |  6 +++---
 2 files changed, 14 insertions(+), 11 deletions(-)

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 aecc4d1..009c63f 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
@@ -46,8 +46,8 @@ import org.apache.ignite.ci.jira.IJiraIntegrationProvider;
 import org.apache.ignite.ci.observer.BuildObserver;
 import org.apache.ignite.ci.observer.BuildsInfo;
 import org.apache.ignite.ci.tcbot.chain.PrChainsProcessor;
-import org.apache.ignite.ci.tcmodel.result.Build;
 import org.apache.ignite.ci.tcmodel.mute.MuteInfo;
+import org.apache.ignite.ci.tcmodel.result.Build;
 import org.apache.ignite.ci.teamcity.ignited.BuildRefCompacted;
 import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
 import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
@@ -55,11 +55,11 @@ import 
org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
 import org.apache.ignite.ci.teamcity.ignited.SyncMode;
 import org.apache.ignite.ci.teamcity.ignited.buildtype.BuildTypeCompacted;
 import org.apache.ignite.ci.teamcity.ignited.buildtype.BuildTypeRefCompacted;
-import org.apache.ignite.ci.web.model.ContributionKey;
-import org.apache.ignite.ci.web.model.VisaRequest;
-import org.apache.ignite.ci.web.model.Visa;
 import org.apache.ignite.ci.user.ICredentialsProv;
+import org.apache.ignite.ci.web.model.ContributionKey;
 import org.apache.ignite.ci.web.model.SimpleResult;
+import org.apache.ignite.ci.web.model.Visa;
+import org.apache.ignite.ci.web.model.VisaRequest;
 import org.apache.ignite.ci.web.model.current.SuiteCurrentStatus;
 import org.apache.ignite.ci.web.model.hist.VisasHistoryStorage;
 import org.apache.ignite.internal.util.typedef.F;
@@ -420,16 +420,19 @@ public class TcBotTriggerAndSignOffService {
         StringBuilder buildTypeId = new StringBuilder();
 
         HelperConfig.getTrackedBranches().get(DEFAULT_TRACKED_BRANCH_NAME)
-            .ifPresent(b -> b.getChainsStream().filter(c -> 
c.branchForRest.equals(ITeamcity.DEFAULT))
-            .findFirst().ifPresent(ch -> buildTypeId.append(ch.suiteId)));
+            .ifPresent(
+                b -> b.getChainsStream()
+                    .filter(c -> Objects.equals(srvId, c.serverId))
+                    .filter(c -> c.branchForRest.equals(ITeamcity.DEFAULT))
+                    .findFirst()
+                    .ifPresent(ch -> buildTypeId.append(ch.suiteId)));
 
         BuildTypeCompacted buildType = buildTypeId.length() > 0 ? 
teamcity.getBuildType(buildTypeId.toString()) : null;
 
         String projectId = Objects.nonNull(buildType) ?
             compactor.getStringFromId(buildType.projectId()) : 
DEFAULT_PROJECT_ID;
 
-        List<String> compositeBuildTypeIds = teamcity
-            .getCompositeBuildTypesIdsSortedByBuildNumberCounter(projectId);
+        List<String> compositeBuildTypeIds = 
teamcity.getCompositeBuildTypesIdsSortedByBuildNumberCounter(projectId);
 
         for (String btId : compositeBuildTypeIds) {
             List<BuildRefCompacted> forTests = findBuildsForPr(btId, prId, 
teamcity);
diff --git 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
index 788dd57..e10cb64 100644
--- 
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
+++ 
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
@@ -56,14 +56,14 @@ import org.apache.ignite.ci.github.pure.IGitHubConnection;
 
     /**
      * @param teamcity TeamCity to get info about tokens.
-     * @param gitHubConnection
+     * @param gitHubConn GitHub integration associated with this server.
      */
     public void setJavaFlags(IAnalyticsEnabledTeamcity teamcity,
-        IGitHubConnection gitHubConnection) {
+        IGitHubConnection gitHubConn) {
         if (teamcity.isTeamCityTokenAvailable())
             javaFlags |= TEAMCITY_FLAG;
 
-        if (gitHubConnection.isGitTokenAvailable())
+        if (gitHubConn.isGitTokenAvailable())
             javaFlags |= GITHUB_FLAG;
 
         if (teamcity.isJiraTokenAvailable())