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 2019/03/12 17:15:31 UTC
[ignite-teamcity-bot] 01/01: IGNITE-11491: Skeleton of new classes
for analyzing revisions involved.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-11491-3
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit d2bae957bb2b315acc4636a06bae8c611e15506a
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Mar 12 20:15:10 2019 +0300
IGNITE-11491: Skeleton of new classes for analyzing revisions involved.
---
.../BuildLink.java => chain/RevisionsSummary.java} | 9 +++++----
.../tcbot/trigger/{BuildLink.java => ChainBuildLink.java} | 13 +++++++++++--
.../org/apache/ignite/ci/tcbot/trigger/TriggerResult.java | 7 +++++--
.../ignite/ci/tcbot/visa/ContributionCheckStatus.java | 4 ++++
.../ci/tcbot/visa/TcBotTriggerAndSignOffService.java | 14 ++++++++++++++
.../ignite/ci/teamcity/ignited/ITeamcityIgnited.java | 1 +
ignite-tc-helper-web/src/main/webapp/pr.html | 12 ++++++------
7 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/BuildLink.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/RevisionsSummary.java
similarity index 80%
copy from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/BuildLink.java
copy to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/RevisionsSummary.java
index dfcb43b..4929388 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/BuildLink.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/RevisionsSummary.java
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.ignite.ci.tcbot.chain;
-package org.apache.ignite.ci.tcbot.trigger;
+import java.util.HashMap;
+import java.util.Map;
-public class BuildLink {
- String webUrl;
- String headShaShort;
+public class RevisionsSummary {
+ private Map<String, Integer> revisionOcurrences = new HashMap<>();
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/BuildLink.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/ChainBuildLink.java
similarity index 79%
rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/BuildLink.java
rename to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/ChainBuildLink.java
index dfcb43b..6f493e8 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/BuildLink.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/ChainBuildLink.java
@@ -17,7 +17,16 @@
package org.apache.ignite.ci.tcbot.trigger;
-public class BuildLink {
+import org.apache.ignite.ci.tcbot.chain.RevisionsSummary;
+
+/**
+ *
+ */
+public class ChainBuildLink extends RevisionsSummary {
+ /** Web url to suite. */
String webUrl;
- String headShaShort;
+
+ public void webUrl(String webUrl) {
+ this.webUrl = webUrl;
+ }
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/TriggerResult.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/TriggerResult.java
index f809bf9..7ec5968 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/TriggerResult.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/trigger/TriggerResult.java
@@ -19,8 +19,11 @@ package org.apache.ignite.ci.tcbot.trigger;
import org.apache.ignite.ci.web.model.SimpleResult;
+/**
+ *
+ */
public class TriggerResult extends SimpleResult {
- public TriggerResult(String result) {
- super(result);
+ public TriggerResult(String res) {
+ super(res);
}
}
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..421b951 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
@@ -18,6 +18,7 @@ package org.apache.ignite.ci.tcbot.visa;
import java.util.LinkedList;
import java.util.List;
+import org.apache.ignite.ci.tcbot.trigger.ChainBuildLink;
/**
* Status of contribution check details returned from server. UI model for displaying detailed {@link
@@ -51,6 +52,9 @@ import java.util.List;
/** Web links to queued suites. */
public List<String> webLinksQueuedSuites = new LinkedList<>();
+ /** Web links to queued suites. */
+ public List<ChainBuildLink> queuedSuites = new LinkedList<>();
+
public ContributionCheckStatus() {
}
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 6ca04b3..6734986 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
@@ -51,6 +51,7 @@ import org.apache.ignite.ci.tcbot.chain.PrChainsProcessor;
import org.apache.ignite.ci.tcbot.conf.IGitHubConfig;
import org.apache.ignite.ci.tcbot.conf.IJiraServerConfig;
import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
+import org.apache.ignite.ci.tcbot.trigger.ChainBuildLink;
import org.apache.ignite.ci.tcmodel.mute.MuteInfo;
import org.apache.ignite.ci.tcmodel.result.Build;
import org.apache.ignite.ci.teamcity.ignited.BuildRefCompacted;
@@ -646,6 +647,19 @@ public class TcBotTriggerAndSignOffService {
status.webLinksQueuedSuites = Stream.concat(queuedSuites.stream(), runningSuites.stream())
.map(ref -> getWebLinkToQueued(teamcity, ref)).collect(Collectors.toList());
+ status.queuedSuites =
+ Stream.concat(queuedSuites.stream(), runningSuites.stream())
+ .map(ref -> {
+ ChainBuildLink buildLink = new ChainBuildLink();
+
+
+
+ buildLink.webUrl(getWebLinkToQueued(teamcity, ref));
+
+ return buildLink;
+ })
+ .collect(Collectors.toList());
+
return status;
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java
index 77301e0..7b7175d 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/ITeamcityIgnited.java
@@ -201,6 +201,7 @@ public interface ITeamcityIgnited {
*/
public List<Agent> agents(boolean connected, boolean authorized);
+ @Deprecated
/**
* @param build Build.
*/
diff --git a/ignite-tc-helper-web/src/main/webapp/pr.html b/ignite-tc-helper-web/src/main/webapp/pr.html
index 8b61c57..5a1282f 100644
--- a/ignite-tc-helper-web/src/main/webapp/pr.html
+++ b/ignite-tc-helper-web/src/main/webapp/pr.html
@@ -30,32 +30,32 @@ $(document).ready(function() {
function parmsForRest() {
var curReqParms = "";
var branchForTc = findGetParameter("branchForTc");
- if(branchForTc!=null) {
+ if (branchForTc != null) {
curReqParms += "?branchForTc=" + branchForTc;
}
var serverId = findGetParameter("serverId");
- if(serverId!=null) {
+ if (serverId != null) {
curReqParms += "&serverId=" + serverId;
}
var suiteId = findGetParameter("suiteId");
- if(suiteId!=null) {
+ if (suiteId != null) {
curReqParms += "&suiteId=" + suiteId;
}
var action = findGetParameter("action");
- if(action!=null) {
+ if (action != null) {
curReqParms += "&action=" + action;
}
var count = findGetParameter("count");
- if(count!=null) {
+ if (count != null) {
curReqParms += "&count=" + count;
}
var baseBranchForTc = findGetParameter("baseBranchForTc");
- if(baseBranchForTc != null) {
+ if (baseBranchForTc != null) {
curReqParms += "&baseBranchForTc=" + baseBranchForTc;
}