You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ir...@apache.org on 2020/06/25 14:10:09 UTC
[ignite-teamcity-bot] branch master updated: Revert "Checkbox
'Delete all files in checkout directory before each snapshot dependency
build' added (#161)"
This is an automated email from the ASF dual-hosted git repository.
irakov 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 6fa6ce6 Revert "Checkbox 'Delete all files in checkout directory before each snapshot dependency build' added (#161)"
6fa6ce6 is described below
commit 6fa6ce616c69d846b6473cdedbe4323bebc2ab29
Author: Ivan Rakov <iv...@gmail.com>
AuthorDate: Thu Jun 25 14:39:34 2020 +0300
Revert "Checkbox 'Delete all files in checkout directory before each snapshot dependency build' added (#161)"
This reverts commit 6d9f9a5d
---
.../ci/tcbot/visa/TcBotTriggerAndSignOffService.java | 3 +--
.../org/apache/ignite/ci/web/rest/TriggerBuilds.java | 5 ++---
ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js | 16 +++++-----------
3 files changed, 8 insertions(+), 16 deletions(-)
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 4898b19..8acb1e1 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
@@ -267,7 +267,6 @@ public class TcBotTriggerAndSignOffService {
@Nullable String ticketId,
@Nullable String prNum,
@Nullable String baseBranchForTc,
- @Nonnull Boolean cleanSources,
@Nullable ITcBotUserCreds prov) {
String jiraRes = "";
@@ -298,7 +297,7 @@ public class TcBotTriggerAndSignOffService {
Set<Integer> buildidsToSync = new HashSet<>();
for (int i = 0; i < suiteIds.length; i++) {
- T2<Build, Set<Integer>> objects = teamcity.triggerBuild(suiteIds[i], branchForTc, cleanSources, top != null && top, new HashMap<>(),
+ T2<Build, Set<Integer>> objects = teamcity.triggerBuild(suiteIds[i], branchForTc, false, top != null && top, new HashMap<>(),
false, "");
buildidsToSync.addAll(objects.get2());
builds[i] = objects.get1();
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java
index ed93be6..75a8d69 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/TriggerBuilds.java
@@ -83,8 +83,7 @@ public class TriggerBuilds {
@Nullable @QueryParam("observe") Boolean observe,
@Nullable @QueryParam("ticketId") String ticketId,
@Nullable @QueryParam("prNum") String prNum,
- @Nullable @QueryParam("baseBranchForTc") String baseBranchForTc,
- @Nonnull @QueryParam("cleanSources") Boolean cleanSources
+ @Nullable @QueryParam("baseBranchForTc") String baseBranchForTc
) {
ITcBotUserCreds prov = ITcBotUserCreds.get(req);
Injector injector = CtxListener.getInjector(ctx);
@@ -96,7 +95,7 @@ public class TriggerBuilds {
String jiraRes = injector
.getInstance(TcBotTriggerAndSignOffService.class)
- .triggerBuildsAndObserve(srvCodeOrAlias, branchForTc, parentSuiteId, suiteIdList, top, observe, ticketId, prNum, baseBranchForTc, cleanSources, prov);
+ .triggerBuildsAndObserve(srvCodeOrAlias, branchForTc, parentSuiteId, suiteIdList, top, observe, ticketId, prNum, baseBranchForTc, prov);
return new TriggerResult("Tests started." + (!jiraRes.isEmpty() ? "<br>" + jiraRes : ""));
}
diff --git a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js
index e3c5ebc..09eb64b 100644
--- a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js
+++ b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js
@@ -302,7 +302,7 @@ function showChainCurrentStatusData(chain, settings) {
"\"" + chain.branchName + "\", " +
"\"" + parentSuitId + "\", " +
"\"\", " + // ticket id
- "\"" + baseBranchForTc + "\")'>Comment JIRA</button><br>";
+ "\"" + baseBranchForTc + "\")'>Comment JIRA</button> ";
var blockersList = "";
@@ -319,8 +319,6 @@ function showChainCurrentStatusData(chain, settings) {
}
}
- res += "<label for='cleanSources'><input id='cleanSources' type='checkbox'>Delete all files in checkout directory before each snapshot dependency build</label><br>"
-
res += "<button onclick='triggerBuilds(" +
"\"" + srvCodeForTriggering + "\", " +
"\"" + parentSuitId + "\", " +
@@ -330,8 +328,7 @@ function showChainCurrentStatusData(chain, settings) {
"false, " + //observe
"null, " + // ticketId
"\"" + + chain.prNum + "\", " +
- "\"" + baseBranchForTc + "\", " +
- "document.getElementById(\"cleanSources\").checked" +
+ "\"" + baseBranchForTc + "\" " +
")'> " +
"Re-run possible blockers</button><br>";
@@ -344,9 +341,7 @@ function showChainCurrentStatusData(chain, settings) {
"false, " + //observe
"null, " + // ticketId
"\"" + chain.prNum + "\", " + //prNum
- "\"" + baseBranchForTc + "\", " +
- "document.getElementById(\"cleanSources\").checked" +
- ")'> " +
+ "\"" + baseBranchForTc + "\")'> " +
"Re-run possible blockers (top queue)</button><br>";
}
@@ -450,7 +445,7 @@ function filterPossibleBlocker(suite) {
return null;
}
-function triggerBuilds(tcServerCode, parentSuiteId, suiteIdList, branchName, top, observe, ticketId, prNum, baseBranchForTc, cleanSources) {
+function triggerBuilds(tcServerCode, parentSuiteId, suiteIdList, branchName, top, observe, ticketId, prNum, baseBranchForTc) {
var queueAtTop = isDefinedAndFilled(top) && top;
var observeJira = isDefinedAndFilled(observe) && observe;
var suiteIdsNotExists = !isDefinedAndFilled(suiteIdList) || suiteIdList.length === 0;
@@ -515,8 +510,7 @@ function triggerBuilds(tcServerCode, parentSuiteId, suiteIdList, branchName, top
"observe": observeJira,
"ticketId": ticketId,
"prNum": prNum,
- "baseBranchForTc": baseBranchForTc,
- "cleanSources": cleanSources
+ "baseBranchForTc": baseBranchForTc
},
success: successDialog,
error: showErrInLoadStatus