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/01/11 12:36:06 UTC
[ignite-teamcity-bot] branch ignite-gg-14609 updated:
IGNITE-GG-14609: Unused suite ID removal
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-gg-14609
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-gg-14609 by this push:
new ab44fe6 IGNITE-GG-14609: Unused suite ID removal
ab44fe6 is described below
commit ab44fe63371d08519a9b47d65ade115eef3390f0
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Jan 11 15:36:01 2019 +0300
IGNITE-GG-14609: Unused suite ID removal
---
.../apache/ignite/ci/web/IBackgroundUpdatable.java | 2 +-
.../java/org/apache/ignite/ci/web/Launcher.java | 5 ++++-
.../ignite/ci/web/model/current/UpdateInfo.java | 2 +-
ignite-tc-helper-web/src/main/webapp/js/prs-1.0.js | 25 +++++++++++-----------
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/IBackgroundUpdatable.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/IBackgroundUpdatable.java
index cd58277..75aeba0 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/IBackgroundUpdatable.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/IBackgroundUpdatable.java
@@ -18,7 +18,7 @@
package org.apache.ignite.ci.web;
/**
- * Created by Дмитрий on 02.11.2017
+ *
*/
public interface IBackgroundUpdatable {
/**
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/Launcher.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/Launcher.java
index 4ff0f81..2d29ff0 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/Launcher.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/Launcher.java
@@ -22,15 +22,18 @@ import java.io.Console;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
+import org.apache.ignite.ci.db.TcHelperDb;
import org.apache.ignite.ci.tcbot.TcBotSystemProperties;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.webapp.WebAppContext;
/**
- * Created by Дмитрий on 04.08.2017
+ * Launcher for server note and web application: all in one.
+ * For client only node use {@link LauncherIgniteClientMode} and {@link TcHelperDb} for server.
*/
public class Launcher {
+ /** */
public static void main(String[] args) throws Exception {
runServer(true);
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
index e10cb64..381855d 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
@@ -21,7 +21,7 @@ import org.apache.ignite.ci.IAnalyticsEnabledTeamcity;
import org.apache.ignite.ci.github.pure.IGitHubConnection;
/**
- * Created by Дмитрий on 19.02.2018
+ *
*/
@SuppressWarnings("WeakerAccess") public class UpdateInfo {
/** TeamCity auth token availability flag. */
diff --git a/ignite-tc-helper-web/src/main/webapp/js/prs-1.0.js b/ignite-tc-helper-web/src/main/webapp/js/prs-1.0.js
index bd68058..33a05b5 100644
--- a/ignite-tc-helper-web/src/main/webapp/js/prs-1.0.js
+++ b/ignite-tc-helper-web/src/main/webapp/js/prs-1.0.js
@@ -224,7 +224,7 @@ function showStageBlockers(stageNum, prId, blockers) {
/* Formatting function for row details - modify as you need */
-function formatContributionDetails(row, srvId, suiteId) {
+function formatContributionDetails(row, srvId) {
// row is the original data object for the row
if(!isDefinedAndFilled(row))
return;
@@ -328,7 +328,7 @@ function formatContributionDetails(row, srvId, suiteId) {
return res;
}
-function repaint(srvId, suiteId) {
+function repaint(srvId) {
let tableId = 'serverContributions-' + srvId;
let datatable = $('#' + tableId).DataTable();
@@ -341,7 +341,7 @@ function repaint(srvId, suiteId) {
if (isDefinedAndFilled(row.child)) {
if (row.child.isShown()) {
// Replaint this row
- row.child(formatContributionDetails(row.data(), srvId, suiteId)).show();
+ row.child(formatContributionDetails(row.data(), srvId)).show();
}
}
}
@@ -349,13 +349,13 @@ function repaint(srvId, suiteId) {
datatable.draw();
}
-function repaintLater(srvId, suiteId) {
+function repaintLater(srvId) {
setTimeout(function () {
- repaint(srvId, suiteId)
+ repaint(srvId)
}, 3000);
}
-function showContributionStatus(status, prId, row, srvId, suiteId) {
+function showContributionStatus(status, prId, row, srvId, suiteIdSelected) {
let tdForPr = $('#showResultFor' + prId);
if (!isDefinedAndFilled(status)) {
@@ -370,8 +370,7 @@ function showContributionStatus(status, prId, row, srvId, suiteId) {
let queuedStatus = "Has queued builds: " + status.queuedBuilds + " queued " + " " + status.runningBuilds + " running";
let replaintCall = "repaintLater(" +
- "\"" + srvId + "\", " +
- "\"" + suiteId + "\", " +
+ "\"" + srvId + "\"" +
");";
var linksToRunningBuilds = "";
@@ -384,7 +383,7 @@ function showContributionStatus(status, prId, row, srvId, suiteId) {
if (buildIsCompleted) {
let finishedBranch = status.branchWithFinishedSuite;
- tdForPr.html("<a id='showReportlink_" + prId + "' href='" + prShowHref(srvId, suiteId, finishedBranch) + "'>" +
+ tdForPr.html("<a id='showReportlink_" + prId + "' href='" + prShowHref(srvId, suiteIdSelected, finishedBranch) + "'>" +
"<button id='show_" + prId + "'>Show " + finishedBranch + " report</button></a>");
if (hasJiraIssue) {
@@ -392,7 +391,7 @@ function showContributionStatus(status, prId, row, srvId, suiteId) {
"commentJira(" +
"\"" + srvId + "\", " +
"\"" + finishedBranch + "\", " +
- "\"" + suiteId + "\", " +
+ "\"" + suiteIdSelected + "\", " +
"\"" + row.jiraIssueId + "\"" +
"); " +
replaintCall +
@@ -442,7 +441,7 @@ function showContributionStatus(status, prId, row, srvId, suiteId) {
let triggerBuildsCall = "triggerBuilds(" +
"\"" + srvId + "\", " +
"null, " +
- "\"" + suiteId + "\", " +
+ "\"" + suiteIdSelected + "\", " +
"\"" + status.resolvedBranch + "\"," +
" false," +
" false," +
@@ -459,7 +458,7 @@ function showContributionStatus(status, prId, row, srvId, suiteId) {
let trigObserveCall = "triggerBuilds(" +
"\"" + srvId + "\", " +
"null, " +
- "\"" + suiteId + "\", " +
+ "\"" + suiteIdSelected + "\", " +
"\"" + status.resolvedBranch + "\"," +
" false," +
" true," +
@@ -480,7 +479,7 @@ function showContributionStatus(status, prId, row, srvId, suiteId) {
$.ajax({
url: "rest/visa/visaStatus" +
"?serverId=" + srvId +
- "&suiteId=" + suiteId +
+ "&suiteId=" + suiteIdSelected +
"&tcBranch=" + status.branchWithFinishedSuite,
success:
function (result) {