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 2018/11/15 13:13:35 UTC

[ignite-teamcity-bot] branch master updated (e73f085 -> b62fcd7)

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git.


    from e73f085  One more build removal from cache
     new 3302a0e  IGNITE-10275 Jira spam fast fix - Fixes #72.
     new b62fcd7  Version update

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/ignite/ci/observer/ObserverTask.java    | 45 +++++++++++-----------
 .../org/apache/ignite/ci/web/model/Version.java    |  2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)


[ignite-teamcity-bot] 01/02: IGNITE-10275 Jira spam fast fix - Fixes #72.

Posted by dp...@apache.org.
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

commit 3302a0ea031d28a8c2ab539a8298cf8934cc32e7
Author: ololo3000 <pm...@gmail.com>
AuthorDate: Thu Nov 15 16:12:51 2018 +0300

    IGNITE-10275 Jira spam fast fix - Fixes #72.
    
    Signed-off-by: Dmitriy Pavlov <dp...@apache.org>
---
 .../apache/ignite/ci/observer/ObserverTask.java    | 45 +++++++++++-----------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java
index 5ad1350..8676868 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java
@@ -141,7 +141,7 @@ public class ObserverTask extends TimerTask {
 
             if (info.isFinishedWithFailures(teamcity)) {
                 boolean rmv = compactInfos().remove(compactInfo);
-                
+
                 Preconditions.checkState(rmv, "Key not found: " + compactInfo);
 
                 logger.error("JIRA will not be commented." +
@@ -157,34 +157,35 @@ public class ObserverTask extends TimerTask {
                 continue;
             }
 
-            ICredentialsProv creds = tcHelper.getServerAuthorizerCreds();
+            try {
+                rmvdVisas.add(objMapper.writeValueAsString(compactInfo));
+            }
+            catch (Exception e) {
+                logger.error("JSON string parse failed: " + e.getMessage(), e);
 
-            Visa visa = jiraIntegration.notifyJira(info.srvId, creds, info.buildTypeId,
-                info.branchForTc, info.ticket);
+                return "Exception while JSON parsing: " + e.getClass().getSimpleName() + ": " + e.getMessage();
+            }
 
-            visasHistoryStorage.updateVisaRequestRes(info.getContributionKey(), info.date, visa);
+            try {
+                boolean rmv = compactInfos().remove(compactInfo);
 
-            if (visa.isSuccess()) {
-                ticketsNotified.add(info.ticket);
+                if (!rmv)
+                    continue;
+            }
+            catch (Exception e) {
+                logger.error("cache remove: " + e.getMessage(), e);
+
+                return X.getFullStackTrace(e);
+            }
 
-                try {
-                    rmvdVisas.add(objMapper.writeValueAsString(compactInfo));
-                }
-                catch (Exception e) {
-                    logger.error("JSON string parse failed: " + e.getMessage(), e);
+            ICredentialsProv creds = tcHelper.getServerAuthorizerCreds();
 
-                    return "Exception while JSON parsing: " + e.getClass().getSimpleName() + ": " + e.getMessage();
-                }
+            Visa visa = jiraIntegration.notifyJira(info.srvId, creds, info.buildTypeId,
+                info.branchForTc, info.ticket);
 
-                try {
-                    compactInfos().remove(compactInfo);
-                }
-                catch (Exception e) {
-                    logger.error("cache remove: " + e.getMessage(), e);
+            visasHistoryStorage.updateVisaRequestRes(info.getContributionKey(), info.date, visa);
 
-                    return X.getFullStackTrace(e);
-                }
-            }
+            ticketsNotified.add(info.ticket);
         }
 
         return "Checked " + checkedBuilds + " not finished " + notFinishedBuilds + " notified: " + ticketsNotified +


[ignite-teamcity-bot] 02/02: Version update

Posted by dp...@apache.org.
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

commit b62fcd789fd12a3a636e91db5998a57402502ed7
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Thu Nov 15 16:13:19 2018 +0300

    Version update
---
 .../src/main/java/org/apache/ignite/ci/web/model/Version.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 44c1aa1..8deea67 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
@@ -23,7 +23,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 = "20181113";
+    public static final String VERSION = "20181115";
 
     /** TC Bot Version. */
     public String version = VERSION;