You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by jo...@apache.org on 2019/08/30 16:26:43 UTC
[ignite-teamcity-bot] branch master updated: Replaced Re-run
possible blockers & comment JIRA with Re-run possible blockers (top queue).
This is an automated email from the ASF dual-hosted git repository.
jokser 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 a5ffb82 Replaced Re-run possible blockers & comment JIRA with Re-run possible blockers (top queue).
a5ffb82 is described below
commit a5ffb828f06e1a50f718800174a77af973fc4095
Author: Jokser <jo...@gmail.com>
AuthorDate: Fri Aug 30 19:26:18 2019 +0300
Replaced Re-run possible blockers & comment JIRA with Re-run possible blockers (top queue).
---
.../java/org/apache/ignite/ci/web/rest/TriggerBuilds.java | 14 ++++++++++++++
ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js | 6 +++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java
index 76c0a2b..75a8d69 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java
@@ -58,6 +58,20 @@ public class TriggerBuilds {
@Context
private HttpServletRequest req;
+ /**
+ * Triggers re-running possible blocker suites.
+ *
+ * @param srvCodeOrAlias Server code or alias (e.g. Apache Ignite, GridGain, GGPrivate).
+ * @param branchForTc Branch name for TeamCity triggering.
+ * @param parentSuiteId Parent suite id for suite need to be re-run.
+ * @param suiteIdList Suite ids need to be re-run (possible blockers).
+ * @param top If {@code true} re-running suites will be placed at the top of TC queue.
+ * @param observe If {@code true} JIRA will be commented with current state of possible blockers.
+ * @param ticketId JIRA ticket id.
+ * @param prNum Pull request number in appropriate project (@code srvCodeOrAlias).
+ * @param baseBranchForTc Base branch for possible blockers comparison (e.g. master, 8.8-master)
+ * @return Result of triggering suites re-run.
+ */
@GET
@Path("trigger")
public TriggerResult triggerBuilds(
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 2fb3542..0424aec 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
@@ -291,12 +291,12 @@ function showChainCurrentStatusData(chain, settings) {
"\"" + parentSuitId + "\", " +
"\"" + blockersList + "\", " +
"\"" + chain.branchName + "\", " +
- "false, " + //top
- "true, " + //observe
+ "true, " + //top
+ "false, " + //observe
"null, " + // ticketId
"\"" + chain.prNum + "\", " + //prNum
"\"" + baseBranchForTc + "\")'> " +
- "Re-run possible blockers & Comment JIRA</button><br>";
+ "Re-run possible blockers (top queue)</button><br>";
}
if (isDefinedAndFilled(baseBranchForTc)) {