IGNITE-9770 Add 'Re-run possible blockers' button #27

zzzadruga · 2018-10-04T09:43:16Z

No description provided.

SomeFire · 2018-10-04T12:13:06Z

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java

@@ -167,7 +167,8 @@ private String observeJira(

        BuildObserver observer = CtxListener.getInjector(context).getInstance(BuildObserver.class);

-        observer.observe(build, srvId, prov, "ignite-" + ticketId);
+        for (Build build : builds)


We shouldn't observe builds for the same PR separately, because in such case we Bot will comment same ticket for every build. We should wait while all of the builds will be finished and comment only once.

SomeFire · 2018-10-04T12:14:22Z

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java

        }

-        return new SimpleResult("OK");
+        if (observe != null && observe)
+            jiraRes = observeJira(srvId, branchName, ticketId, helper, teamcity, prov, buildList.toArray(new Build[0]));


Redundant argument new Build[0].

SomeFire · 2018-10-04T12:15:38Z

ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js

+        }
+    }
+
+    res += "<button onclick='triggerBuilds(\"" + server.serverId + "\", \"" + blockersList + "\", \"" + server.branchName + "\", false, false)'> Re-run possible blockers</button>&nbsp;&nbsp;";


Too long line. Also, add <br> tag.

SomeFire · 2018-10-04T12:16:19Z

ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js

+
+    res += "<button onclick='triggerBuilds(\"" + server.serverId + "\", \"" + blockersList + "\", \"" + server.branchName + "\", false, false)'> Re-run possible blockers</button>&nbsp;&nbsp;";
+
+    res += "<button onclick='triggerBuilds(\"" + server.serverId + "\", \"" + blockersList + "\", \"" + server.branchName + "\", false, true)'> Re-run possible blockers & Comment JIRA</button>";


Too long line. Also, add <br> tag and move this under settings.isJiraAvailable() check.

SomeFire · 2018-10-04T12:17:49Z

ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js

@@ -125,11 +124,11 @@ function showChainCurrentStatusData(server, settings) {
    if (suitesFailedList.length !== 0 && isDefinedAndFilled(server.serverId) && isDefinedAndFilled(server.branchName)) {
        mInfo += "Trigger failed " + cntFailed + " builds";
        mInfo += " <a href='javascript:void(0);' ";
-        mInfo += " onClick='triggerBuilds(\"" + server.serverId + "\", \"" + suitesFailedList + "\", \"" + server.branchName + "\", false)' ";
+        mInfo += " onClick='triggerBuilds(\"" + server.serverId + "\", \"" + suitesFailedList + "\", \"" + server.branchName + "\", false, false)' ";


Too long line.

SomeFire · 2018-10-04T12:17:55Z

ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js

        mInfo += " title='trigger builds'>in queue</a> ";

        mInfo += " <a href='javascript:void(0);' ";
-        mInfo += " onClick='triggerBuilds(\"" + server.serverId + "\", \"" + suitesFailedList + "\", \"" + server.branchName + "\", true)' ";
+        mInfo += " onClick='triggerBuilds(\"" + server.serverId + "\", \"" + suitesFailedList + "\", \"" + server.branchName + "\", true, false)' ";


Too long line.

…possible button&comment jira' button

# Conflicts: # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java

# Conflicts: # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java

SomeFire · 2018-10-08T11:25:33Z

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/BuildsInfo.java

+
+    /** {@inheritDoc} */
+    @Override public int hashCode() {
+


Remove empty line.

SomeFire · 2018-10-08T11:26:08Z

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/BuildsInfo.java

+     */
+    public boolean isFinished(IAnalyticsEnabledTeamcity teamcity) {
+        for (Map.Entry<Build, Boolean> entry : finishedBuilds.entrySet()){
+            if (!entry.getValue()){


Need space before opening brace.

SomeFire · 2018-10-08T11:26:26Z

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/BuildsInfo.java

+import org.apache.ignite.ci.tcmodel.result.Build;
+import org.apache.ignite.ci.user.ICredentialsProv;
+
+public class BuildsInfo{


Need space before opening brace.

SomeFire · 2018-10-08T11:36:52Z

ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js


-    var partsOfStr = suiteIdList.split(',');
+    if (possibleBlockersNotFound) {


Remove braces for one-line if statement.

SomeFire · 2018-10-08T11:39:02Z

ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js

-                            buttons: {
-                                "Ok": function() {
-                                    $(this).dialog("close");
+    if (possibleBlockersNotFound){


Add space before opening brace.

SomeFire · 2018-10-08T14:38:29Z

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/BuildsInfo.java

@@ -0,0 +1,100 @@
+package org.apache.ignite.ci.observer;


Missed license.

SomeFire · 2018-10-08T14:38:58Z

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/BuildsInfo.java

+    /** Branch name. */
+    public final String branchName;
+
+    /** Prov. */


Credentials.

SomeFire · 2018-10-08T14:40:10Z

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java

@@ -71,14 +72,16 @@ public SimpleResult triggerBuild(
        if (!prov.hasAccess(srvId))
            throw ServiceUnauthorizedException.noCreds(srvId);

+        if (isNullOrEmpty(suiteIdList))
+            return new SimpleResult("Error: nothing to run");


Missed dot.

SomeFire · 2018-10-08T14:50:37Z

...-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java

@@ -77,7 +78,7 @@
    @NotNull public String triggerBuildAndObserve(
        @Nullable String srvId,
        @Nullable String branchForTc,
-        @Nullable String suiteId,
+        @Nullable String suiteIdList,


Rename this method to triggerBuildsAndObserve.

SomeFire · 2018-10-08T15:00:10Z

ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js

@@ -214,14 +236,21 @@ function addBlockersData(server, settings) {
        return "";

    var blockers = "";
+    var blockersList = "";


Variable is never used.

….1.js

SomeFire · 2018-10-09T11:28:25Z

ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js

    var queueAtTop = isDefinedAndFilled(top) && top;
+    var observeJira = isDefinedAndFilled(observe) && observe;
+    var suiteIdsNotFound = suiteIdList.length === 0;


Will not work if suiteIdList is undefined.

IGNITE-9770 Add 'Re-run possible blockers' button

cd5fdd0

SomeFire suggested changes Oct 4, 2018

View reviewed changes

Nikolai Kulagin added 3 commits October 5, 2018 12:06

IGNITE-9770 Refactor 're-run posssible blockers' button, add 're-run …

afc2df9

…possible button&comment jira' button

Merge branch 'master' into IGNITE-9770

e534d01

# Conflicts: # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java

IGNITE-9770 Fix codestyle

a7f53f6

zzzadruga force-pushed the IGNITE-9770 branch from 2dd078e to a7f53f6 Compare October 5, 2018 09:37

Nikolai Kulagin added 5 commits October 5, 2018 15:53

IGNITE-9770 Refactor

a25fc4e

IGNITE-9770 Show a message about the absence of possible blockers

96bfff8

Merge branch 'master' into IGNITE-9770

6fa2e96

# Conflicts: # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuild.java

IGNITE-9770 Refactor after merge

dd19e1d

IGNITE-9770 Fix counter

5681f2f

zzzadruga force-pushed the IGNITE-9770 branch from ac6f3d3 to 5681f2f Compare October 8, 2018 09:51

SomeFire suggested changes Oct 8, 2018

View reviewed changes

IGNITE-9770 Fix codestyle and refactor triggerBuilds() on testfails-2…

294c366

….1.js

zzzadruga force-pushed the IGNITE-9770 branch from 27c5e7c to 294c366 Compare October 8, 2018 19:02

SomeFire reviewed Oct 9, 2018

View reviewed changes

Nikolai Kulagin added 2 commits October 9, 2018 15:57

IGNITE-9770 Bug fix

3c25982

IGNITE-9770 Refactor notifyJira()

4d57a98

asfgit closed this in bd96ed3 Oct 10, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

IGNITE-9770 Add 'Re-run possible blockers' button #27

IGNITE-9770 Add 'Re-run possible blockers' button #27

zzzadruga commented Oct 4, 2018

SomeFire Oct 4, 2018

SomeFire Oct 4, 2018

SomeFire Oct 4, 2018

SomeFire Oct 4, 2018

SomeFire Oct 4, 2018

SomeFire Oct 4, 2018

SomeFire Oct 8, 2018

SomeFire Oct 8, 2018

SomeFire Oct 8, 2018

SomeFire Oct 8, 2018

SomeFire Oct 8, 2018

SomeFire Oct 8, 2018

SomeFire Oct 8, 2018

SomeFire Oct 8, 2018

SomeFire Oct 8, 2018

SomeFire Oct 8, 2018

SomeFire Oct 9, 2018 •

edited


		res += "<button onclick='triggerBuilds(\"" + server.serverId + "\", \"" + blockersList + "\", \"" + server.branchName + "\", false, false)'> Re-run possible blockers</button>  ";

		res += "<button onclick='triggerBuilds(\"" + server.serverId + "\", \"" + blockersList + "\", \"" + server.branchName + "\", false, true)'> Re-run possible blockers & Comment JIRA</button>";


		var partsOfStr = suiteIdList.split(',');
		if (possibleBlockersNotFound) {

IGNITE-9770 Add 'Re-run possible blockers' button #27

IGNITE-9770 Add 'Re-run possible blockers' button #27

Conversation

zzzadruga commented Oct 4, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SomeFire Oct 9, 2018 • edited

Choose a reason for hiding this comment

SomeFire Oct 9, 2018 •

edited