Skip to content

Update a single InterruptedBuildAction rather than creating a second one #10610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krisstern merged 5 commits into from
May 30, 2025
Merged

Update a single InterruptedBuildAction rather than creating a second one #10610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f969d0
Update a single `InterruptedBuildAction` rather than creating a secon…
jglick Apr 29, 2025
837ae6a
Regression test
jglick Apr 29, 2025
7543e3f
Merge branch 'master' into InterruptedBuildAction
jglick May 5, 2025
ea21b12
Merge branch 'master' into InterruptedBuildAction
jglick May 8, 2025
2049277
Merge branch 'master' into InterruptedBuildAction
jglick May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion core/src/main/java/hudson/model/Executor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Vector;
import java.util.concurrent.Callable;
Expand Down Expand Up @@ -284,7 +285,14 @@ public void recordCauseOfInterruption(Run<?, ?> build, TaskListener listener) {
lock.writeLock().unlock();
}

build.addAction(new InterruptedBuildAction(r));
InterruptedBuildAction action = build.getAction(InterruptedBuildAction.class);
if (action != null) {
Collection<CauseOfInterruption> combinedCauses = new LinkedHashSet<>(action.getCauses());
combinedCauses.addAll(r);
build.replaceAction(new InterruptedBuildAction(combinedCauses));
} else {
build.addAction(new InterruptedBuildAction(r));
}
for (CauseOfInterruption c : r)
c.print(listener);
}
Expand Down
33 changes: 33 additions & 0 deletions test/src/test/java/hudson/model/ExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
Expand All @@ -16,7 +17,9 @@
import hudson.slaves.OfflineCause;
import hudson.util.OneShotEvent;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import jenkins.model.CauseOfInterruption;
import jenkins.model.CauseOfInterruption.UserInterruption;
import jenkins.model.InterruptedBuildAction;
import jenkins.model.Jenkins;
Expand Down Expand Up @@ -227,4 +230,34 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
}
}
}

@Test
public void recordCauseOfInterruption() throws Exception {
FreeStyleProject p = j.createFreeStyleProject();
p.getBuildersList().add(TestBuilder.of((build, launcher, listener) -> {
Executor exec = build.getExecutor();
exec.interrupt(Result.NOT_BUILT, new TestCauseOfInterruption("one"), new TestCauseOfInterruption("two"));
exec.recordCauseOfInterruption(build, listener);
exec.interrupt(Result.NOT_BUILT, new TestCauseOfInterruption("three"), new TestCauseOfInterruption("four"));
exec.recordCauseOfInterruption(build, listener);
}));
FreeStyleBuild b = j.buildAndAssertStatus(Result.NOT_BUILT, p);
assertThat(b.getActions(InterruptedBuildAction.class).stream().map(iba -> iba.getCauses().stream().map(CauseOfInterruption::getShortDescription).toList()).toList(), is(List.of(List.of("one", "two", "three", "four"))));
Copy link
Member Author

@jglick jglick Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without fix, fails with

java.lang.AssertionError: 

Expected: is <[[one, two, three, four]]>
     but: was <[[one, two], [three, four]]>
	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:6)
	at hudson.model.ExecutorTest.recordCauseOfInterruption(ExecutorTest.java:245)

}

private static final class TestCauseOfInterruption extends CauseOfInterruption {
private final String msg;

TestCauseOfInterruption(String msg) {
this.msg = msg;

}

@Override
public String getShortDescription() {
return msg;
}
}


}
Loading