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 f0cf13d Existing parameters supported in trusted branch query form
f0cf13d is described below
commit f0cf13de2ab3242ddc56777a4139408f0c60f3e3
Author: Dmitriy Pavlov <[email protected]>
AuthorDate: Mon Jul 22 20:17:59 2019 +0300
Existing parameters supported in trusted branch query form
---
ignite-tc-helper-web/src/main/webapp/current.html | 49 ++++++++++++++---------
ignite-tc-helper-web/src/main/webapp/guard.html | 13 +++---
2 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/webapp/current.html
b/ignite-tc-helper-web/src/main/webapp/current.html
index a704bdf..78a1e50 100644
--- a/ignite-tc-helper-web/src/main/webapp/current.html
+++ b/ignite-tc-helper-web/src/main/webapp/current.html
@@ -54,14 +54,16 @@ function showQueryForm() {
displayMode: 'Failures',
sortOption: 'FailureRate',
//count of builds to merge
- count: 1
+ count: 1,
+ trustedTests: true,
+ checkAllLogs: false
},
methods: {
formChanged: function () {
if (count < 1)
count = 1;
- checkForUpdate();
+ loadData();
genLink();
}
}
@@ -88,6 +90,16 @@ function showQueryForm() {
gVue.$data.count = count;
}
+ let trustedTests = findGetParameter("trustedTests");
+ if (trustedTests != null) {
+ gVue.$data.trustedTests = trustedTests==="true";
+ }
+
+ let checkAllLogs = findGetParameter("checkAllLogs");
+ if (checkAllLogs != null) {
+ gVue.$data.checkAllLogs = checkAllLogs==="true";
+ }
+
genLink();
}
@@ -107,14 +119,12 @@ function parmsForRest() {
var branch = findGetParameter("branch");
curReqParms += "?branch=" + (branch != null ? branch : "master");
- var checkAllLogs = findGetParameter("checkAllLogs");
- if (checkAllLogs != null) {
- curReqParms += "&checkAllLogs=" + checkAllLogs;
+ if (gVue.$data.checkAllLogs != null) {
+ curReqParms += "&checkAllLogs=" + gVue.$data.checkAllLogs;
}
- var trustedTests = findGetParameter("trustedTests");
- if (trustedTests != null) {
- curReqParms += "&trustedTests=" + trustedTests;
+ if (gVue.$data.trustedTests != null) {
+ curReqParms += "&trustedTests=" + gVue.$data.trustedTests;
}
var tagSelected = gVue.$data.tagSelected;
@@ -246,10 +256,9 @@ function showData(result) {
</script>
-<div id="vueQueryForm" class="h-25">
- <v-app id="prQueryForm" name="prQueryForm" class="h-25">
- <br>
- <span class="formgroup">
+<div id="vueQueryForm">
+ <v-app id="prQueryForm" name="prQueryForm">
+ <div class="formgroup">
<span>Tag filter: </span>
<select v-model="tagSelected" @change="formChanged">
<option disabled value="">Please select one</option>
@@ -268,12 +277,16 @@ function showData(result) {
<option value="FailureRate">Failure Rate</option>
<option value="SuiteDuration">Suite Duration</option>
</select>
- <span>Merge Builds: </span> <input v-model.number="count"
type="number" @change="formChanged">
- <span> <a id="permalink"></a> </span>
- </span>
-
- <span id="loadStatus"></span>
- <br>
+ <br>
+ <span>Merge Builds: </span> <input v-model.number="count"
type="number" @change="formChanged">
+ <span title="Show trusted tests count">Trusted tests:
</span> <input type="checkbox" v-model="trustedTests" @change="formChanged">
+ <span title="Download and parse all logs">Check logs:
</span> <input type="checkbox" v-model="checkAllLogs" @change="formChanged">
+
+ <span> <a id="permalink"></a> </span>
+
+
+ <span id="loadStatus"></span>
+ </div>
<br>
<div id="divFailures"></div>
</v-app>
diff --git a/ignite-tc-helper-web/src/main/webapp/guard.html
b/ignite-tc-helper-web/src/main/webapp/guard.html
index a74aa3d..e0a072e 100644
--- a/ignite-tc-helper-web/src/main/webapp/guard.html
+++ b/ignite-tc-helper-web/src/main/webapp/guard.html
@@ -41,16 +41,15 @@ function loadData() {
}
function showTrackedBranchesLinks(result) {
- var res = "";
+ var res = "<table>";
for (var i = 0; i < result.length; i++) {
var id = result[i];
- // res += "<div class='formgroup'>";
- res += id + ":";
- res += "<a href='current.html?branch=" + id + "'><button>Latest (" +
id + ")</button></a>";
- res += " <a href='current.html?branch=" + id +
"&checkAllLogs=true' title='With logs processing'><button>Latest (" + id + " +
logs)</button></a>";
- res += " <a href='all.html?branch=" + id + "'><button
title='Failures from last 10 runs merged'>History (" + id + ")</button></a>";
+ res += "<tr>";
+ res += "<td align='right'>" + id + ":</td>";
+ res += "<td>" + "<a href='current.html?branch=" + id +
"'><button>Latest (" + id + ")</button></a>" + "</td>";
+ res += "<td>" + " <a href='all.html?branch=" + id +
"'><button title='Failures from last 10 runs merged'>History (" + id +
")</button></a>" + "</td>";
// res += "</div>";
- res += "<br>";
+ res += "</tr>";
}
res += "</table>";
