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 d574430 Run All should be default instead of Run All Nightly;
automatic selecting default configuration
d574430 is described below
commit d574430d2bcaee7739e4cb90b0903e4bd6371a50
Author: Dmitriy Pavlov <dpav...@apache.org>
AuthorDate: Wed Jul 31 18:19:39 2019 +0300
Run All should be default instead of Run All Nightly; automatic selecting
default configuration
---
.../ci/tcbot/visa/ContributionCheckStatus.java | 13 ++++++++++-
.../tcbot/visa/TcBotTriggerAndSignOffService.java | 27 +++++++++++++---------
.../org/apache/ignite/ci/web/model/Version.java | 2 +-
.../src/main/webapp/js/{prs-1.1.js => prs-1.2.js} | 11 +++++++--
ignite-tc-helper-web/src/main/webapp/prs.html | 2 +-
5 files changed, 39 insertions(+), 16 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/ContributionCheckStatus.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/ContributionCheckStatus.java
index 1f86394..c926d62 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/ContributionCheckStatus.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/ContributionCheckStatus.java
@@ -51,9 +51,20 @@ import java.util.List;
/** Web links to queued suites. */
public List<String> webLinksQueuedSuites = new LinkedList<>();
- public ContributionCheckStatus() {
+ /** Default build type. */
+ public boolean defaultBuildType = false;
+
+ /**
+ * @param suiteId Suite id.
+ */
+ public ContributionCheckStatus(String suiteId) {
+ this.suiteId = suiteId;
}
+ /**
+ * @param suiteId Suite id.
+ * @param resolvedBranch Resolved branch.
+ */
public ContributionCheckStatus(String suiteId, String resolvedBranch) {
this.suiteId = suiteId;
this.resolvedBranch = resolvedBranch;
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java
index 7fc19f9..3a11a14 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java
@@ -577,29 +577,36 @@ public class TcBotTriggerAndSignOffService {
}
/**
- * @param srvCode Server (service) internal code.
+ * @param srvCodeOrAlias Server (service) internal code.
* @param prov Prov.
* @param prId Pr id from {@link ContributionToCheck#prNumber}. Negative
value imples branch number (with
* appropriate prefix from GH config).
*/
- public Set<ContributionCheckStatus> contributionStatuses(String srvCode,
ITcBotUserCreds prov,
+ public Set<ContributionCheckStatus> contributionStatuses(String
srvCodeOrAlias, ITcBotUserCreds prov,
String prId) {
Set<ContributionCheckStatus> statuses = new LinkedHashSet<>();
- ITeamcityIgnited teamcity = tcIgnitedProv.server(srvCode, prov);
+ ITeamcityIgnited teamcity = tcIgnitedProv.server(srvCodeOrAlias, prov);
+
+ String defaultBuildType = findDefaultBuildType(srvCodeOrAlias);
- IGitHubConnIgnited ghConn = gitHubConnIgnitedProvider.server(srvCode);
+ IGitHubConnIgnited ghConn =
gitHubConnIgnitedProvider.server(srvCodeOrAlias);
- Preconditions.checkState(ghConn.config().code().equals(srvCode));
+
Preconditions.checkState(ghConn.config().code().equals(srvCodeOrAlias));
- List<String> compositeBuildTypeIds = findApplicableBuildTypes(srvCode,
teamcity);
+ List<String> compositeBuildTypeIds =
findApplicableBuildTypes(srvCodeOrAlias, teamcity);
for (String btId : compositeBuildTypeIds) {
List<BuildRefCompacted> buildsForBt = findBuildsForPr(btId, prId,
ghConn, teamcity);
- statuses.add(buildsForBt.isEmpty()
+ ContributionCheckStatus contributionAgainstSuite =
buildsForBt.isEmpty()
? new ContributionCheckStatus(btId, branchForTcDefault(prId,
ghConn))
- : contributionStatus(srvCode, btId, buildsForBt, teamcity,
ghConn, prId));
+ : contributionStatus(srvCodeOrAlias, btId, buildsForBt,
teamcity, ghConn, prId);
+
+ if(Objects.equals(btId, defaultBuildType))
+ contributionAgainstSuite.defaultBuildType = true;
+
+ statuses.add(contributionAgainstSuite);
}
return statuses;
@@ -678,9 +685,7 @@ public class TcBotTriggerAndSignOffService {
*/
public ContributionCheckStatus contributionStatus(String srvId, String
suiteId, List<BuildRefCompacted> builds,
ITeamcityIgnited teamcity, IGitHubConnIgnited ghConn, String prId) {
- ContributionCheckStatus status = new ContributionCheckStatus();
-
- status.suiteId = suiteId;
+ ContributionCheckStatus status = new ContributionCheckStatus(suiteId);
List<BuildRefCompacted> finishedOrCancelled = builds.stream()
.filter(t -> t.isFinished(compactor)).collect(Collectors.toList());
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 d5af68e..b1ce2f9 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 = "20190729";
+ public static final String VERSION = "20190731";
/** Java version, where Web App is running. */
public String javaVer;
diff --git a/ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js
b/ignite-tc-helper-web/src/main/webapp/js/prs-1.2.js
similarity index 97%
rename from ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js
rename to ignite-tc-helper-web/src/main/webapp/js/prs-1.2.js
index e92ab77..8c0b59b 100644
--- a/ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js
+++ b/ignite-tc-helper-web/src/main/webapp/js/prs-1.2.js
@@ -313,19 +313,26 @@ function formatContributionDetails(row, srvId) {
function (result) {
let selectHtml = "<select id='selectChain_" + prId + "'
style='width: 350px'>";
- let isCompleted = [],
+ let isDefault = [],
+ isCompleted = [],
isIncompleted = [],
suites = new Map();
+ //See also
org.apache.ignite.ci.tcbot.visa.ContributionCheckStatus
for (let status of result) {
suites.set(status.suiteId, status);
- if (isDefinedAndFilled(status.branchWithFinishedSuite))
+ if (isDefinedAndFilled(status.defaultBuildType) &&
status.defaultBuildType === true)
+ isDefault.push(status);
+ else if
(isDefinedAndFilled(status.branchWithFinishedSuite))
isCompleted.push(status);
else
isIncompleted.push(status);
}
+ for (let status of isDefault)
+ selectHtml += "<option value='true' style='font-weight:
bold; color: darkblue'>" + status.suiteId + "</option>";
+
for (let status of isCompleted)
selectHtml += "<option value='true'>" + status.suiteId +
"</option>";
diff --git a/ignite-tc-helper-web/src/main/webapp/prs.html
b/ignite-tc-helper-web/src/main/webapp/prs.html
index 473591a..9b57866 100644
--- a/ignite-tc-helper-web/src/main/webapp/prs.html
+++ b/ignite-tc-helper-web/src/main/webapp/prs.html
@@ -19,7 +19,7 @@
<script src="js/common-1.6.js"></script>
<script src="js/testfails-2.2.js"></script>
- <script src="js/prs-1.1.js"></script>
+ <script src="js/prs-1.2.js"></script>
<style>
