diff --git a/changelog.html b/changelog.html index f2a4ea15d8..cc46c8079a 100644 --- a/changelog.html +++ b/changelog.html @@ -69,6 +69,9 @@ Upcoming changes
,R extends A // lock the workspace of the last build FilePath ws=lb.getWorkspace(); - if (ws==null || !ws.exists()) { + if (workspaceOffline(lb)) { // workspace offline. build now, or nothing will ever be built Label label = getAssignedLabel(); if (label != null && label.isSelfLabel()) { @@ -1326,6 +1326,24 @@ public abstract class AbstractProject
,R extends A return NO_CHANGES; } } + + private boolean workspaceOffline(R build) throws IOException, InterruptedException { + FilePath ws = build.getWorkspace(); + if (ws==null || !ws.exists()) { + return true; + } + + Node builtOn = build.getBuiltOn(); + if (builtOn == null) { // node built-on doesn't exist anymore + return true; + } + + if (builtOn.toComputer() == null) { // node still exists, but has 0 executors - o.s.l.t. + return true; + } + + return false; + } /** * Returns true if this user has made a commit to this project.