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/10/04 13:29:47 UTC
[ignite-teamcity-bot] branch master updated: PR checking form added
to services
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 d9dd57d PR checking form added to services
d9dd57d is described below
commit d9dd57dda01e5f08290e552f364835774fce1bd0
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Thu Oct 4 16:29:38 2018 +0300
PR checking form added to services
---
.../org/apache/ignite/ci/web/model/Version.java | 6 ++--
.../src/main/webapp/css/style-1.5.css | 1 -
ignite-tc-helper-web/src/main/webapp/index.html | 4 +--
ignite-tc-helper-web/src/main/webapp/services.html | 34 +++++++++++++++++++---
4 files changed, 36 insertions(+), 9 deletions(-)
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 6b54c2f..ff9946a 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
@@ -21,9 +21,11 @@ package org.apache.ignite.ci.web.model;
/** Default contact. */
public static final String DEFAULT_CONTACT = "dev@ignite.apache.org";
public static final String GITHUB_REF = "https://github.com/apache/ignite-teamcity-bot";
- public static final String VERSION = "20181003";
- /** TC Helper Version. */
+ /** TC Bot Version. */
+ public static final String VERSION = "20181004";
+
+ /** TC Bot Version. */
public String version = VERSION;
/** Ignite version. */
diff --git a/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css b/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css
index 7e3f91f..caa863d 100644
--- a/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css
+++ b/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css
@@ -25,7 +25,6 @@ table, tr, td {
}
table.stat td, table.stat th {
-
padding: 10px 5px 10px 5px;
}
diff --git a/ignite-tc-helper-web/src/main/webapp/index.html b/ignite-tc-helper-web/src/main/webapp/index.html
index 2e0dd83..ba81507 100644
--- a/ignite-tc-helper-web/src/main/webapp/index.html
+++ b/ignite-tc-helper-web/src/main/webapp/index.html
@@ -42,7 +42,7 @@ function loadData() {
url: "rest/branches/suites",
success: function(result) {
$("#loadStatus").html("");
- showSuitesForPrCheckData(result);
+ showFormAndSuitesForPrCheck(result);
tryToFillAutocompleteLists();
},
error: showErrInLoadStatus
@@ -78,7 +78,7 @@ function showCurrentBranchesData(result) {
$("#branchesStatus").html(res);
}
-function showSuitesForPrCheckData(result) {
+function showFormAndSuitesForPrCheck(result) {
var res = "";
for (var i = 0; i < result.length; i++) {
diff --git a/ignite-tc-helper-web/src/main/webapp/services.html b/ignite-tc-helper-web/src/main/webapp/services.html
index eb33737..228d1af 100644
--- a/ignite-tc-helper-web/src/main/webapp/services.html
+++ b/ignite-tc-helper-web/src/main/webapp/services.html
@@ -37,6 +37,7 @@ function loadData() {
success: function(result) {
$("#loadStatus").html("");
showSuitesForTeamCityRunData(result);
+ showFormAndSuitesForPrCheck(result);
tryToFillAutocompleteLists();
showCommentJiraForm(result);
},
@@ -155,17 +156,42 @@ function jiraTicketNumber(ticket) {
return regExpr.exec(ticket)[2];
}
+
+function showFormAndSuitesForPrCheck(result) {
+ var res = "";
+
+ for (var i = 0; i < result.length; i++) {
+ var chainAtServer = result[i];
+
+ res += "<form action='pr.html'>";
+ res += "Server: <input type='text' name='serverId' value=" + chainAtServer.serverId + " readonly>";
+ res += "Chain: <input type='text' name='suiteId' value=" + chainAtServer.suiteId + ">";
+ res += "Base branch: <input class='branchForTc" + chainAtServer.serverId +
+ "' type='text' name='baseBranchForTc' title='Etalon branch, e.g refs/heads/master'> ";
+ res += "<b>Branch:</b> <input class='branchForTc" + chainAtServer.serverId +
+ "' type='text' name='branchForTc' title='Tested branch, e.g. pull/4790/head or ignite-9349' required> ";
+ res += "<input type='submit' name='action' value='Latest' title='Show latest runs'>";
+ // res+="<input type='submit' name='action' value='Chain'>";
+ res += "<input type='submit' name='action' value='History' title='Show last 10 runs merged'>";
+ res += "</form>";
+ }
+
+ $("#suitesForPrCheck").html(res);
+}
</script>
</head>
<body>
<div id="loadStatus"></div>
-Trigger TeamCity Run All: <br>
+Trigger new TeamCity Run All for a PR/Branch: <br>
<div id="suitesForRunAll"></div>
-<br>
+<br><br>
+
+Notify JIRA (save TC Bot visa to a ticket comment): <br>
+<div id="notifyJira"></div><br>
-Notify JIRA: <br>
-<div id="notifyJira"></div>
+See results of branch/PR TeamCity Run All: <br>
+<div id="suitesForPrCheck"></div>
<!--Notify GitHub: <br>
<div id="notifyGitHub">