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 34736ab Merge builds count added
34736ab is described below
commit 34736ab8016ddabb2cc8c7d8dbb52f67e12c5f6b
Author: Dmitriy Pavlov <[email protected]>
AuthorDate: Mon Jul 22 20:02:19 2019 +0300
Merge builds count added
---
.../rest/tracked/GetTrackedBranchTestResults.java | 27 +++++++++++-------
ignite-tc-helper-web/src/main/webapp/current.html | 32 ++++++++++++++++++----
2 files changed, 43 insertions(+), 16 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/tracked/GetTrackedBranchTestResults.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/tracked/GetTrackedBranchTestResults.java
index a9affe8..474d40c 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/tracked/GetTrackedBranchTestResults.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/tracked/GetTrackedBranchTestResults.java
@@ -68,9 +68,10 @@ public class GetTrackedBranchTestResults {
@Nullable @QueryParam("trustedTests") Boolean trustedTests,
@Nullable @QueryParam("tagSelected") String tagSelected,
@Nullable @QueryParam("displayMode") String displayMode,
- @Nullable @QueryParam("sortOption") String sortOption) {
+ @Nullable @QueryParam("sortOption") String sortOption,
+ @Nullable @QueryParam("count") Integer mergeCnt) {
return new
UpdateInfo().copyFrom(getTestFailsResultsNoSync(branchOrNull, checkAllLogs,
trustedTests, tagSelected,
- displayMode, sortOption));
+ displayMode, sortOption, mergeCnt));
}
@GET
@@ -81,8 +82,9 @@ public class GetTrackedBranchTestResults {
@Nullable @QueryParam("trustedTests") Boolean trustedTests,
@Nullable @QueryParam("tagSelected") String tagSelected,
@Nullable @QueryParam("displayMode") String displayMode,
- @Nullable @QueryParam("sortOption") String sortOption) {
- return getTestFailsResultsNoSync(branchOrNull, checkAllLogs,
trustedTests, tagSelected, displayMode, sortOption).toString();
+ @Nullable @QueryParam("sortOption") String sortOption,
+ @Nullable @QueryParam("count") Integer mergeCnt) {
+ return getTestFailsResultsNoSync(branchOrNull, checkAllLogs,
trustedTests, tagSelected, displayMode, sortOption, mergeCnt).toString();
}
@GET
@@ -93,8 +95,9 @@ public class GetTrackedBranchTestResults {
@Nullable @QueryParam("trustedTests") Boolean trustedTests,
@Nullable @QueryParam("tagSelected") String tagSelected,
@Nullable @QueryParam("displayMode") String displayMode,
- @Nullable @QueryParam("sortOption") String sortOption) {
- return latestBuildResults(branch, checkAllLogs, trustedTests,
tagSelected, SyncMode.NONE, displayMode, sortOption);
+ @Nullable @QueryParam("sortOption") String sortOption,
+ @Nullable @QueryParam("count") Integer mergeCnt) {
+ return latestBuildResults(branch, checkAllLogs, trustedTests,
tagSelected, SyncMode.NONE, displayMode, sortOption, mergeCnt);
}
@GET
@@ -106,8 +109,9 @@ public class GetTrackedBranchTestResults {
@Nullable @QueryParam("trustedTests") Boolean trustedTests,
@Nullable @QueryParam("tagSelected") String tagSelected,
@Nullable @QueryParam("displayMode") String displayMode,
- @Nullable @QueryParam("sortOption") String sortOption) {
- return latestBuildResults(branch, checkAllLogs, trustedTests,
tagSelected, SyncMode.RELOAD_QUEUED, displayMode, sortOption);
+ @Nullable @QueryParam("sortOption") String sortOption,
+ @Nullable @QueryParam("count") Integer mergeCnt) {
+ return latestBuildResults(branch, checkAllLogs, trustedTests,
tagSelected, SyncMode.RELOAD_QUEUED, displayMode, sortOption, mergeCnt);
}
@NotNull private DsSummaryUi latestBuildResults(
@@ -117,13 +121,16 @@ public class GetTrackedBranchTestResults {
@Nullable String tagSelected,
@Nonnull SyncMode mode,
@Nullable String displayMode,
- @Nullable String sortOption) {
+ @Nullable String sortOption,
+ @Nullable Integer mergeCnt) {
ITcBotUserCreds creds = ITcBotUserCreds.get(req);
Injector injector = CtxListener.getInjector(ctx);
+ int actualMergeBuilds = (mergeCnt == null || mergeCnt < 1) ? 1 :
mergeCnt;
+
return injector.getInstance(IDetailedStatusForTrackedBranch.class)
- .getTrackedBranchTestFailures(branch, checkAllLogs, 1, creds, mode,
+ .getTrackedBranchTestFailures(branch, checkAllLogs,
actualMergeBuilds, creds, mode,
Boolean.TRUE.equals(trustedTests), tagSelected,
DisplayMode.parseStringValue(displayMode),
SortOption.parseStringValue(sortOption));
diff --git a/ignite-tc-helper-web/src/main/webapp/current.html
b/ignite-tc-helper-web/src/main/webapp/current.html
index f65c9a2..a704bdf 100644
--- a/ignite-tc-helper-web/src/main/webapp/current.html
+++ b/ignite-tc-helper-web/src/main/webapp/current.html
@@ -21,8 +21,8 @@ var g_shownDataHashCodeHex = "";
var gVue;
function genLink() {
- let newUrl = "./current.html?";
-
+ let newUrl = "./current.html" + parmsForRest();
+ /*
var branch = findGetParameter("branch");
newUrl += "branch=" + (branch != null ? branch : "master");
@@ -35,6 +35,10 @@ function genLink() {
if (gVue.$data.sortOption != null)
newUrl += "&sortOption=" + gVue.$data.sortOption;
+ if (gVue.$data.count != null)
+ newUrl += "&count=" + gVue.$data.count;
+ */
+
let permalink = $("#permalink");
permalink.attr("href", newUrl);
@@ -48,10 +52,15 @@ function showQueryForm() {
tagSelected: '',
tagsPresent: [""],
displayMode: 'Failures',
- sortOption: 'FailureRate'
+ sortOption: 'FailureRate',
+ //count of builds to merge
+ count: 1
},
methods: {
formChanged: function () {
+ if (count < 1)
+ count = 1;
+
checkForUpdate();
genLink();
}
@@ -74,6 +83,11 @@ function showQueryForm() {
gVue.$data.sortOption = sortOption;
}
+ let count = findGetParameter("count");
+ if (count != null) {
+ gVue.$data.count = count;
+ }
+
genLink();
}
@@ -89,10 +103,9 @@ $(document).ready(function() {
function parmsForRest() {
var curReqParms = "";
+
var branch = findGetParameter("branch");
- if (branch != null) {
- curReqParms += "?branch=" + branch;
- }
+ curReqParms += "?branch=" + (branch != null ? branch : "master");
var checkAllLogs = findGetParameter("checkAllLogs");
if (checkAllLogs != null) {
@@ -119,6 +132,9 @@ function parmsForRest() {
curReqParms += "&sortOption=" + sortOption;
}
+ if (gVue.$data.count != null)
+ curReqParms += "&count=" + gVue.$data.count;
+
return curReqParms;
}
@@ -232,6 +248,7 @@ function showData(result) {
<div id="vueQueryForm" class="h-25">
<v-app id="prQueryForm" name="prQueryForm" class="h-25">
+ <br>
<span class="formgroup">
<span>Tag filter: </span>
<select v-model="tagSelected" @change="formChanged">
@@ -251,10 +268,13 @@ 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>
<div id="divFailures"></div>
</v-app>
</div>
