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/15 12:48:31 UTC
[ignite-teamcity-bot] branch ignite-10930 updated: IGNITE-10930:
PR-less contributions: correct loading of tickets list
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10930
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10930 by this push:
new 24c4353 IGNITE-10930: PR-less contributions: correct loading of tickets list
24c4353 is described below
commit 24c4353f9f3b2a62292e4c704bb443d1ca96b6f1
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Jan 15 15:48:29 2019 +0300
IGNITE-10930: PR-less contributions: correct loading of tickets list
---
.../src/main/java/org/apache/ignite/ci/jira/Status.java | 6 ++++++
.../src/main/java/org/apache/ignite/ci/jira/Ticket.java | 8 ++++++++
.../main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java | 4 +---
.../java/org/apache/ignite/ci/jira/ignited/JiraTicketDao.java | 5 +++--
.../java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java | 6 +++---
.../ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java | 9 +++++----
6 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Status.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Status.java
index 79faa68..94d2131 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Status.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Status.java
@@ -23,6 +23,12 @@ import com.google.common.base.MoreObjects;
* Status for Jira ticket.
*/
public class Status {
+ /** Patch Available status name. */
+ public static final String PA_NAME = "Patch Available";
+
+ /** In Progress status name. */
+ public static final String IP_NAME = "In Progress";
+
/** Status text (open, resolved, etc). */
public String name;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Ticket.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Ticket.java
index 10221cc..e74727c 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Ticket.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Ticket.java
@@ -56,4 +56,12 @@ public class Ticket {
.add("fields", fields)
.toString();
}
+
+ /**
+ * Checks if ticket relates to some Active (In progress/Patch Available) Contribution.
+ */
+ public boolean isActiveContribution() {
+ return Status.PA_NAME.equals(status())
+ || Status.IP_NAME.equals(status());
+ }
}
\ No newline at end of file
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java
index 2e45501..5a39821 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java
@@ -16,9 +16,7 @@
*/
package org.apache.ignite.ci.jira.ignited;
-import com.google.common.collect.Sets;
import java.io.IOException;
-import java.util.Collection;
import java.util.Set;
import javax.inject.Inject;
import org.apache.ignite.ci.jira.Ticket;
@@ -69,7 +67,7 @@ class JiraIgnited implements IJiraIgnited {
@Override public Set<Ticket> getTickets() {
jiraTicketSync.ensureActualizeJiraTickets(taskName("actualizeJiraTickets"), srvId);
- return jiraTicketDao.getTickets(srvIdMaskHigh);
+ return jiraTicketDao.getTickets(srvIdMaskHigh, ticketPrefix());
}
/**
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketDao.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketDao.java
index dbc9d32..fb97221 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketDao.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketDao.java
@@ -59,9 +59,10 @@ public class JiraTicketDao {
/**
* @param srvIdMaskHigh Server id mask high.
+ * @param ticketPrefix Fixed prefix for JIRA tickets.
* @return Jira tickets.
*/
- public Set<Ticket> getTickets(int srvIdMaskHigh) {
+ public Set<Ticket> getTickets(int srvIdMaskHigh, String ticketPrefix) {
Preconditions.checkNotNull(jiraCache, "init() was not called");
long srvId = (long) srvIdMaskHigh << 32;
@@ -69,7 +70,7 @@ public class JiraTicketDao {
for (Cache.Entry<Long, TicketCompacted> entry : jiraCache) {
if ((entry.getKey() & srvId) == srvId)
- res.add(entry.getValue().toTicket(compactor));
+ res.add(entry.getValue().toTicket(compactor, ticketPrefix));
}
return res;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java
index 6391d31..5876641 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java
@@ -48,13 +48,13 @@ public class TicketCompacted {
/**
* @param comp Compactor.
+ * @param ticketPrefix Ticket name fixed prefix for the project.
*/
- public Ticket toTicket(IStringCompactor comp) {
+ public Ticket toTicket(IStringCompactor comp, String ticketPrefix) {
Ticket ticket = new Ticket();
- //todo take prefix from outside
ticket.id = id;
- ticket.key = "IGNITE-" + igniteId;
+ ticket.key = ticketPrefix + igniteId;
ticket.fields = new Fields();
ticket.fields.status = new Status(comp.getStringFromId(status));
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 1e39a26..d7e919f 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
@@ -30,7 +30,6 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
-import java.util.SortedSet;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nonnull;
@@ -45,10 +44,8 @@ import org.apache.ignite.ci.github.PullRequest;
import org.apache.ignite.ci.github.ignited.IGitHubConnIgnited;
import org.apache.ignite.ci.github.ignited.IGitHubConnIgnitedProvider;
import org.apache.ignite.ci.jira.Ticket;
-import org.apache.ignite.ci.jira.Tickets;
import org.apache.ignite.ci.jira.ignited.IJiraIgnited;
import org.apache.ignite.ci.jira.ignited.IJiraIgnitedProvider;
-import org.apache.ignite.ci.jira.pure.IJiraIntegration;
import org.apache.ignite.ci.jira.pure.IJiraIntegrationProvider;
import org.apache.ignite.ci.observer.BuildObserver;
import org.apache.ignite.ci.observer.BuildsInfo;
@@ -423,7 +420,11 @@ public class TcBotTriggerAndSignOffService {
String prj = jiraIntegration.projectName();
Set<Ticket> tickets = jiraIntegration.getTickets();
- System.out.println("srvId=" + srvId + " tickets " + tickets);
+
+ List<Ticket> paTickets = tickets.stream().filter(Ticket::isActiveContribution).collect(Collectors.toList());
+
+ System.out.println("srvId=" + srvId + " tickets " + paTickets);
+
//todo JIRA ignited