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/06/05 13:03:47 UTC
[ignite-teamcity-bot] branch master updated: IGNITE-11896 Fix for
Comment JIRA for case aliased TC is used and comment is called from pr.html
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 1bd99a1 IGNITE-11896 Fix for Comment JIRA for case aliased TC is used and comment is called from pr.html
1bd99a1 is described below
commit 1bd99a15f8da178d1b8d1edb530d06696026b22c
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Wed Jun 5 16:03:38 2019 +0300
IGNITE-11896 Fix for Comment JIRA for case aliased TC is used and comment is called from pr.html
---
.../ignite/ci/tcbot/chain/PrChainsProcessor.java | 23 +++++----
.../tcbot/chain/TrackedBranchChainsProcessor.java | 10 ++--
.../org/apache/ignite/ci/web/model/Version.java | 2 +-
.../model/current/ChainAtServerCurrentStatus.java | 29 +++++++++---
.../ci/web/model/current/SuiteCurrentStatus.java | 3 +-
.../ignite/ci/web/rest/GetChainResultsAsHtml.java | 6 +--
.../ci/web/rest/build/GetBuildTestFailures.java | 54 +++++++++++-----------
.../src/main/webapp/js/testfails-2.2.js | 31 +++++++------
8 files changed, 88 insertions(+), 70 deletions(-)
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 38f52fa..9247de2 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
@@ -22,29 +22,28 @@ import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import javax.inject.Inject;
-
-import org.apache.ignite.tcservice.ITeamcity;
import org.apache.ignite.ci.analysis.FullChainRunCtx;
import org.apache.ignite.ci.analysis.mode.LatestRebuildMode;
import org.apache.ignite.ci.analysis.mode.ProcessLogsMode;
-import org.apache.ignite.tcbot.common.interceptor.AutoProfiling;
import org.apache.ignite.ci.github.ignited.IGitHubConnIgnited;
import org.apache.ignite.ci.github.ignited.IGitHubConnIgnitedProvider;
import org.apache.ignite.ci.jira.ignited.IJiraIgnited;
import org.apache.ignite.ci.jira.ignited.IJiraIgnitedProvider;
import org.apache.ignite.ci.tcbot.visa.BranchTicketMatcher;
-import org.apache.ignite.tcignited.history.IRunHistory;
-import org.apache.ignite.tcbot.persistence.IStringCompactor;
-import org.apache.ignite.tcignited.ITeamcityIgnited;
-import org.apache.ignite.tcignited.ITeamcityIgnitedProvider;
-import org.apache.ignite.tcignited.SyncMode;
-import org.apache.ignite.tcignited.history.RunHistSync;
import org.apache.ignite.ci.user.ITcBotUserCreds;
import org.apache.ignite.ci.web.model.current.ChainAtServerCurrentStatus;
import org.apache.ignite.ci.web.model.current.SuiteCurrentStatus;
import org.apache.ignite.ci.web.model.current.TestFailure;
import org.apache.ignite.ci.web.model.current.TestFailuresSummary;
import org.apache.ignite.ci.web.rest.parms.FullQueryParams;
+import org.apache.ignite.tcbot.common.interceptor.AutoProfiling;
+import org.apache.ignite.tcbot.persistence.IStringCompactor;
+import org.apache.ignite.tcignited.ITeamcityIgnited;
+import org.apache.ignite.tcignited.ITeamcityIgnitedProvider;
+import org.apache.ignite.tcignited.SyncMode;
+import org.apache.ignite.tcignited.history.IRunHistory;
+import org.apache.ignite.tcignited.history.RunHistSync;
+import org.apache.ignite.tcservice.ITeamcity;
import org.jetbrains.annotations.Nullable;
/**
@@ -128,8 +127,8 @@ public class PrChainsProcessor {
String baseBranch = Strings.isNullOrEmpty(baseBranchForTc) ? ITeamcity.DEFAULT : baseBranchForTc;
- final FullChainRunCtx ctx = buildChainProcessor.loadFullChainContext(
- tcIgnited,
+ FullChainRunCtx ctx = buildChainProcessor.loadFullChainContext(
+ tcIgnited,
hist,
rebuild,
logs,
@@ -137,7 +136,7 @@ public class PrChainsProcessor {
baseBranch,
mode);
- final ChainAtServerCurrentStatus chainStatus = new ChainAtServerCurrentStatus(tcIgnited.serverCode(), branchForTc);
+ ChainAtServerCurrentStatus chainStatus = new ChainAtServerCurrentStatus(srvCode, tcIgnited.serverCode(), branchForTc);
chainStatus.baseBranchForTc = baseBranch;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
index 09869c3..7289f9b 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
@@ -75,18 +75,20 @@ public class TrackedBranchChainsProcessor {
tracked.chains.stream()
.filter(chainTracked -> tcIgnitedProv.hasAccess(chainTracked.serverId, creds))
.map(chainTracked -> {
- final String srvId = chainTracked.serverId;
+ final String srvCode = chainTracked.serverId;
final String branchForTc = chainTracked.getBranchForRestMandatory();
//branch is tracked, so fail rate should be taken from this branch data (otherwise it is specified).
final String baseBranchTc = chainTracked.getBaseBranchForTc().orElse(branchForTc);
- final ChainAtServerCurrentStatus chainStatus = new ChainAtServerCurrentStatus(srvId, branchForTc);
+ ITeamcityIgnited tcIgnited = tcIgnitedProv.server(srvCode, creds);
- chainStatus.baseBranchForTc = baseBranchTc;
+ ChainAtServerCurrentStatus chainStatus = new ChainAtServerCurrentStatus(srvCode,
+ tcIgnited.serverCode(),
+ branchForTc);
- ITeamcityIgnited tcIgnited = tcIgnitedProv.server(srvId, creds);
+ chainStatus.baseBranchForTc = baseBranchTc;
String suiteIdMandatory = chainTracked.getSuiteIdMandatory();
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 dbe5b2b..29df77b 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 = "20190604";
+ public static final String VERSION = "20190605";
/** Java version, where Web App is running. */
public String javaVer;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/ChainAtServerCurrentStatus.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/ChainAtServerCurrentStatus.java
index b9df193..ba20658 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/ChainAtServerCurrentStatus.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/ChainAtServerCurrentStatus.java
@@ -55,8 +55,15 @@ public class ChainAtServerCurrentStatus {
public String chainName;
/** Server ID. */
+ @Deprecated
public final String serverId;
+ /** General server (service) code: JIRA, GH, TC. But if TC aliased {@link #tcServerCode} is used for TC. */
+ public final String serverCode;
+
+ /** Teamcity connection server (service) code. Same with {@link #serverCode} */
+ public final String tcServerCode;
+
/** Branch name in teamcity identification. */
public final String branchName;
@@ -117,8 +124,15 @@ public class ChainAtServerCurrentStatus {
/** Total blockers count. */
public int totalBlockers;
- public ChainAtServerCurrentStatus(String srvId, String branchTc) {
- this.serverId = srvId;
+ /**
+ * @param srvCode Server code.
+ * @param tcSvcCode Tc service code.
+ * @param branchTc Branch tc.
+ */
+ public ChainAtServerCurrentStatus(String srvCode, String tcSvcCode, String branchTc) {
+ this.serverCode = srvCode;
+ this.tcServerCode = tcSvcCode;
+ this.serverId = tcSvcCode;
this.branchName = branchTc;
}
@@ -275,6 +289,8 @@ public class ChainAtServerCurrentStatus {
return buildNotFound == status.buildNotFound &&
Objects.equals(chainName, status.chainName) &&
Objects.equals(serverId, status.serverId) &&
+ Objects.equals(serverCode, status.serverCode) &&
+ Objects.equals(tcServerCode, status.tcServerCode) &&
Objects.equals(branchName, status.branchName) &&
Objects.equals(webToHist, status.webToHist) &&
Objects.equals(webToBuild, status.webToBuild) &&
@@ -299,10 +315,11 @@ public class ChainAtServerCurrentStatus {
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hash(chainName, serverId, branchName, webToHist, webToBuild, ticketFullName, webToTicket, prNum,
- webToPr, suites, failedTests, failedToFinish, durationPrintable, durationNetTimePrintable,
- sourceUpdateDurationPrintable, artifcactPublishingDurationPrintable, dependeciesResolvingDurationPrintable,
- testsDurationPrintable, lostInTimeouts, topLongRunning, logConsumers, buildNotFound, baseBranchForTc);
+ return Objects.hash(chainName, serverId, serverCode, tcServerCode, branchName, webToHist, webToBuild,
+ ticketFullName, webToTicket, prNum, webToPr, suites, failedTests, failedToFinish, durationPrintable,
+ durationNetTimePrintable, sourceUpdateDurationPrintable, artifcactPublishingDurationPrintable,
+ dependeciesResolvingDurationPrintable, testsDurationPrintable, lostInTimeouts, topLongRunning,
+ logConsumers, buildNotFound, baseBranchForTc);
}
public void setBuildNotFound(boolean buildNotFound) {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
index c9921da..398b7c8 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/SuiteCurrentStatus.java
@@ -78,7 +78,8 @@ import static org.apache.ignite.ci.util.UrlUtil.escape;
@Nullable public Integer runningBuildCount;
@Nullable public Integer queuedBuildCount;
- /** TC getOrCreateCreds id. */
+ /** TC server id. To be replaced by separated services IDs */
+ @Deprecated
public String serverId;
/** Suite ID in teamcity identification. */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetChainResultsAsHtml.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetChainResultsAsHtml.java
index 4745f41..91b6f98 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetChainResultsAsHtml.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetChainResultsAsHtml.java
@@ -64,7 +64,7 @@ public class GetChainResultsAsHtml {
private HttpServletRequest req;
//test here http://localhost:8080/rest/chainResults/html?serverId=public&buildId=1086222
- public void showChainOnServersResults(StringBuilder res, Integer buildId, String srvId) {
+ public void showChainOnServersResults(StringBuilder res, Integer buildId, String srvCode) {
//todo solve report auth problem
final Injector injector = CtxListener.getInjector(ctx);
final BuildChainProcessor buildChainProcessor = injector.getInstance(BuildChainProcessor.class);
@@ -72,7 +72,7 @@ public class GetChainResultsAsHtml {
String failRateBranch = ITeamcity.DEFAULT;
ITcBotUserCreds creds = ITcBotUserCreds.get(req);
- ITeamcityIgnited tcIgn = injector.getInstance(ITeamcityIgnitedProvider.class).server(srvId, creds);
+ ITeamcityIgnited tcIgn = injector.getInstance(ITeamcityIgnitedProvider.class).server(srvCode, creds);
final FullChainRunCtx ctx = buildChainProcessor.loadFullChainContext(
tcIgn,
@@ -83,7 +83,7 @@ public class GetChainResultsAsHtml {
failRateBranch,
SyncMode.RELOAD_QUEUED);
- ChainAtServerCurrentStatus status = new ChainAtServerCurrentStatus(tcIgn.serverCode(), ctx.branchName());
+ ChainAtServerCurrentStatus status = new ChainAtServerCurrentStatus(srvCode, tcIgn.serverCode(), ctx.branchName());
ctx.getRunningUpdates().forEach(FutureUtil::getResultSilent);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
index a8cc782..4ec3894 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
@@ -18,43 +18,41 @@
package org.apache.ignite.ci.web.rest.build;
import com.google.common.collect.BiMap;
-import java.text.ParseException;
-
import com.google.inject.Injector;
-import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
-import org.apache.ignite.ci.tcbot.trends.MasterTrendsService;
-import org.apache.ignite.tcbot.persistence.IStringCompactor;
-import org.apache.ignite.tcignited.SyncMode;
-import org.apache.ignite.ci.teamcity.ignited.buildcondition.BuildCondition;
-import org.apache.ignite.ci.tcbot.chain.BuildChainProcessor;
-import org.apache.ignite.tcservice.ITeamcity;
+import java.text.ParseException;
+import java.util.Collections;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import org.apache.ignite.ci.analysis.FullChainRunCtx;
import org.apache.ignite.ci.analysis.mode.LatestRebuildMode;
import org.apache.ignite.ci.analysis.mode.ProcessLogsMode;
-import org.apache.ignite.tcignited.ITeamcityIgnited;
-import org.apache.ignite.tcignited.ITeamcityIgnitedProvider;
+import org.apache.ignite.ci.tcbot.chain.BuildChainProcessor;
+import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
+import org.apache.ignite.ci.tcbot.trends.MasterTrendsService;
+import org.apache.ignite.ci.teamcity.ignited.buildcondition.BuildCondition;
import org.apache.ignite.ci.user.ITcBotUserCreds;
-import org.apache.ignite.ci.web.model.trends.BuildStatisticsSummary;
-import org.apache.ignite.ci.web.model.trends.BuildsHistory;
import org.apache.ignite.ci.web.CtxListener;
import org.apache.ignite.ci.web.model.current.ChainAtServerCurrentStatus;
import org.apache.ignite.ci.web.model.current.TestFailuresSummary;
import org.apache.ignite.ci.web.model.current.UpdateInfo;
+import org.apache.ignite.ci.web.model.trends.BuildStatisticsSummary;
+import org.apache.ignite.ci.web.model.trends.BuildsHistory;
import org.apache.ignite.tcbot.common.exeption.ServiceUnauthorizedException;
+import org.apache.ignite.tcbot.persistence.IStringCompactor;
+import org.apache.ignite.tcignited.ITeamcityIgnited;
+import org.apache.ignite.tcignited.ITeamcityIgnitedProvider;
+import org.apache.ignite.tcignited.SyncMode;
+import org.apache.ignite.tcservice.ITeamcity;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import java.util.Collections;
-import java.util.concurrent.atomic.AtomicInteger;
-
import static com.google.common.base.Strings.isNullOrEmpty;
@Path(GetBuildTestFailures.BUILD)
@@ -126,8 +124,8 @@ public class GetBuildTestFailures {
ProcessLogsMode procLogs = (checkAllLogs != null && checkAllLogs) ? ProcessLogsMode.ALL : ProcessLogsMode.SUITE_NOT_COMPLETE;
- final FullChainRunCtx ctx = buildChainProcessor.loadFullChainContext(
- tcIgnited,
+ FullChainRunCtx ctx = buildChainProcessor.loadFullChainContext(
+ tcIgnited,
Collections.singletonList(buildId),
LatestRebuildMode.NONE,
procLogs,
@@ -135,9 +133,9 @@ public class GetBuildTestFailures {
failRateBranch,
syncMode);
- final ChainAtServerCurrentStatus chainStatus = new ChainAtServerCurrentStatus(srvCode, ctx.branchName());
+ ChainAtServerCurrentStatus chainStatus = new ChainAtServerCurrentStatus(srvCode, tcIgnited.serverCode(), ctx.branchName());
- int cnt = (int) ctx.getRunningUpdates().count();
+ int cnt = (int)ctx.getRunningUpdates().count();
if (cnt > 0)
runningUpdates.addAndGet(cnt);
diff --git a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js
index 72222a0..8c87e3d 100644
--- a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js
+++ b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js
@@ -108,7 +108,7 @@ function showChainCurrentStatusData(chain, settings) {
res += "<table style='width: 100%;' border='0px'>";
res += "<tr bgcolor='#F5F5FF'><td colspan='3' width='75%'>";
res += "<table style='width: 40%'>";
- res += "<tr><td><b> Server: </b></td><td>[" + chain.serverId + "]</td></tr>";
+ res += "<tr><td><b> Server: </b></td><td>[" + chain.serverCode +"] TC: ["+ chain.tcServerCode + "]</td></tr>";
if (isDefinedAndFilled(chain.prNum)) {
res += "<tr><td><b> PR: </b></td><td>";
@@ -178,15 +178,15 @@ function showChainCurrentStatusData(chain, settings) {
cntFailed++;
}
- if (suitesFailedList.length !== 0 && isDefinedAndFilled(chain.serverId) && isDefinedAndFilled(chain.branchName)) {
+ if (suitesFailedList.length !== 0 && isDefinedAndFilled(chain.tcServerCode) && isDefinedAndFilled(chain.branchName)) {
mInfo += "Trigger failed " + cntFailed + " builds";
mInfo += " <a href='javascript:void(0);' ";
- mInfo += " onClick='triggerBuilds(\"" + chain.serverId + "\", \"" + parentSuitId + "\", " +
+ mInfo += " onClick='triggerBuilds(\"" + chain.tcServerCode + "\", \"" + parentSuitId + "\", " +
"\"" + suitesFailedList + "\", \"" + chain.branchName + "\", false, false, null, \"" + chain.prNum + "\")' ";
mInfo += " title='trigger builds'>in queue</a> ";
mInfo += " <a href='javascript:void(0);' ";
- mInfo += " onClick='triggerBuilds(\"" + chain.serverId + "\", \"" + parentSuitId + "\", " +
+ mInfo += " onClick='triggerBuilds(\"" + chain.tcServerCode + "\", \"" + parentSuitId + "\", " +
"\"" + suitesFailedList + "\", \"" + chain.branchName + "\", true, false, null, \"" + chain.prNum + "\")' ";
mInfo += " title='trigger builds'>on top</a><br>";
}
@@ -233,8 +233,9 @@ function showChainCurrentStatusData(chain, settings) {
// res += "<button onclick='notifyGit()'>Update PR status</button>";
// }
- if (settings.isJiraAvailable()) {
- res += "<button onclick='commentJira(\"" + chain.serverId + "\", \"" + chain.branchName + "\", \""
+ if (settings.isJiraAvailable() && isDefinedAndFilled(chain.serverCode)) {
+ let serverCode = chain.serverCode; //chain.tcServerCode can represent reference to a service generated using alias.
+ res += "<button onclick='commentJira(\"" + serverCode + "\", \"" + chain.branchName + "\", \""
+ parentSuitId + "\")'>Comment JIRA</button> ";
var blockersList = "";
@@ -252,11 +253,11 @@ function showChainCurrentStatusData(chain, settings) {
}
}
- res += "<button onclick='triggerBuilds(\"" + chain.serverId + "\", \"" + parentSuitId + "\", \"" +
+ res += "<button onclick='triggerBuilds(\"" + chain.tcServerCode + "\", \"" + parentSuitId + "\", \"" +
blockersList + "\", \"" + chain.branchName + "\", false, false, null, \"" + + chain.prNum + "\")'> " +
"Re-run possible blockers</button><br>";
- res += "<button onclick='triggerBuilds(\"" + chain.serverId + "\", \"" + parentSuitId + "\", \"" +
+ res += "<button onclick='triggerBuilds(\"" + chain.tcServerCode + "\", \"" + parentSuitId + "\", \"" +
blockersList + "\", \"" + chain.branchName + "\", false, true, null, \"" + + chain.prNum +"\")'> " +
"Re-run possible blockers & Comment JIRA</button><br>";
}
@@ -364,7 +365,7 @@ function filterPossibleBlocker(suite) {
return null;
}
-function triggerBuilds(serverId, parentSuiteId, suiteIdList, branchName, top, observe, ticketId, prNum) {
+function triggerBuilds(tcServerCode, parentSuiteId, suiteIdList, branchName, top, observe, ticketId, prNum) {
var queueAtTop = isDefinedAndFilled(top) && top;
var observeJira = isDefinedAndFilled(observe) && observe;
var suiteIdsNotExists = !isDefinedAndFilled(suiteIdList) || suiteIdList.length === 0;
@@ -392,7 +393,7 @@ function triggerBuilds(serverId, parentSuiteId, suiteIdList, branchName, top, ob
var parentSuite = isDefinedAndFilled(parentSuiteId) ? parentSuiteId : suites[0];
var fewSuites = suites.length > 1;
- var message = "Trigger build" + (fewSuites ? "s" : "") + " at <b>server:</b> " + serverId + "<br>" +
+ var message = "Trigger build" + (fewSuites ? "s" : "") + " at <b>TC server:</b> " + tcServerCode + "<br>" +
"<b>Branch:</b> " + branchName + "<br><b>Top:</b> " + top + "<br>" +
"<b>Suite ID" + (fewSuites ? "s" : "") + ":</b> ";
@@ -421,7 +422,7 @@ function triggerBuilds(serverId, parentSuiteId, suiteIdList, branchName, top, ob
$.ajax({
url: 'rest/build/trigger',
data: {
- "serverId": serverId,
+ "serverId": tcServerCode,
"branchName": branchName,
"parentSuiteId" : parentSuite,
"suiteIdList": suiteIdList,
@@ -470,7 +471,7 @@ function branchForTc(pr) {
return pr;
}
-function commentJira(serverId, branchName, parentSuiteId, ticketId) {
+function commentJira(serverCode, branchName, parentSuiteId, ticketId) {
var branchNotExists = !isDefinedAndFilled(branchName) || branchName.length === 0;
branchName = branchNotExists ? null : branchForTc(branchName);
ticketId = (isDefinedAndFilled(ticketId) && ticketId.length > 0) ? ticketId : null;
@@ -497,7 +498,7 @@ function commentJira(serverId, branchName, parentSuiteId, ticketId) {
$.ajax({
url: 'rest/build/commentJira',
data: {
- "serverId": serverId,
+ "serverId": serverCode, //general Servers code
"suiteId": parentSuiteId,
"branchName": branchName,
"ticketId": ticketId
@@ -514,7 +515,7 @@ function commentJira(serverId, branchName, parentSuiteId, ticketId) {
ticketId = $("#enterTicketId").val();
- commentJira(serverId, branchName, parentSuiteId, ticketId)
+ commentJira(serverCode, branchName, parentSuiteId, ticketId)
},
"Cancel": function () {
$(this).dialog("close");
@@ -531,7 +532,7 @@ function commentJira(serverId, branchName, parentSuiteId, ticketId) {
var dialog = $("#triggerDialog");
- dialog.html("Trigger builds at server: " + serverId + "<br>" +
+ dialog.html("Trigger builds at server: " + serverCode + "<br>" +
" Suite: " + parentSuiteId + "<br>Branch:" + branchName +
"<br><br> Result: " + result.result +
(needTicketId ? ("<br><br>Enter JIRA ticket number: <input type='text' id='enterTicketId'>") : ""));