Ignore ci branches if PR has no pending builds

flink-ci · Oct 10, 2021 · 81595c7 · 81595c7
1 parent 1d3d3c2
commit 81595c7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/com/ververica/CiBot.java b/src/main/java/com/ververica/CiBot.java
@@ -47,9 +47,11 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -70,6 +72,8 @@ public class CiBot implements Runnable, AutoCloseable {
 	private final int pollingIntervalInSeconds;
 	private final int backlogHours;
 
+	private final Set<Integer> pullRequestWithPendingBuilds = new HashSet<>();
+
 	public static void main(String[] args) throws Exception {
 		final Arguments arguments = new Arguments();
 		final JCommander jCommander = JCommander.newBuilder()
@@ -189,12 +193,19 @@ public void close() {
 
 	private void tick(Date lastUpdateTime) throws Exception {
 		final Map<Integer, Collection<String>> branchesByPrID = core.getBranches();
-		core.getPullRequests(lastUpdateTime)
+		core.getPullRequests(lastUpdateTime, pullRequestWithPendingBuilds)
 				.map(FunctionWithException.wrap(
 						core::processPullRequest,
 						(r, e) -> LOG.error("Error while processing pull request {}.", formatPullRequestID(r.getID()), e)))
 				.filter(Optional::isPresent)
 				.map(Optional::get)
+				.peek(ciReport -> {
+					if (Stream.concat(ciReport.getRequiredBuilds(), Stream.concat(ciReport.getUnknownBuilds(), ciReport.getPendingBuilds())).findAny().isPresent()) {
+						pullRequestWithPendingBuilds.add(ciReport.getPullRequestID());
+					} else {
+						pullRequestWithPendingBuilds.remove(ciReport.getPullRequestID());
+					}
+				})
 				.forEach(ConsumerWithException.wrap(
 						ciReport -> processCiReport(
 								ciReport,

diff --git a/src/main/java/com/ververica/Core.java b/src/main/java/com/ververica/Core.java
@@ -216,7 +216,7 @@ public Map<Integer, Collection<String>> getBranches() throws IOException {
 		return branchesByPrID;
 	}
 
-	public Stream<GithubPullRequest> getPullRequests(Date lastUpdatedAtCutoff) throws IOException {
+	public Stream<GithubPullRequest> getPullRequests(Date lastUpdatedAtCutoff, Set<Integer> pullRequestWithPendingBuilds) throws IOException {
 		LOG.info("Retrieving observed repository state ({}).", observedRepository);
 
 		Iterable<GithubPullRequest> recentlyUpdatedOpenPullRequests = gitHubActions.getRecentlyUpdatedOpenPullRequests(observedRepository, lastUpdatedAtCutoff);
@@ -229,8 +229,8 @@ public Stream<GithubPullRequest> getPullRequests(Date lastUpdatedAtCutoff) throw
 						Integer.parseInt(matcher.group(REGEX_GROUP_PULL_REQUEST_ID)),
 						Date.from(Instant.now()),
 						matcher.group(REGEX_GROUP_COMMIT_HASH)))
-				.filter(pr -> !pullRequestsToProcessByID.containsKey(pr.getID()))
-				.forEach(pr -> pullRequestsToProcessByID.put(pr.getID(), pr));
+				.filter(pr -> pullRequestWithPendingBuilds.contains(pr.getID()))
+				.forEach(pr -> pullRequestsToProcessByID.putIfAbsent(pr.getID(), pr));
 
 		return pullRequestsToProcessByID.values().stream();
 	}