Merge branch 'test-deletion' into log-rotation-cleanup

pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.88</version>
+        <version>5.1</version>
         <relativePath/>
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -63,11 +63,8 @@
     </pluginRepositories>
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <!-- TODO: Waiting for https://github.com/jenkinsci/jenkins/pull/9810 to make it to an LTS line. -->
-        <jenkins.version>2.479-rc35395.f676b_e52239c</jenkins.version>
-        <!-- Waiting for a release of https://github.com/jenkinsci/plugin-pom/pull/1004 -->
-        <jenkins-test-harness.version>2289.vfd344a_6d1660</jenkins-test-harness.version>
-        <hpi-plugin.version>3.58</hpi-plugin.version>
+        <!-- TODO: Waiting for JENKINS-73824 and JENKINS-73835 to make it into an LTS line -->
+        <jenkins.version>2.481</jenkins.version>
         <no-test-jar>false</no-test-jar>
         <useBeta>true</useBeta>
         <hpi.compatibleSinceVersion>2.26</hpi.compatibleSinceVersion>
@@ -77,21 +74,14 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-weekly</artifactId>
-                <version>3387.v0f2773fa_3200</version>
+                <artifactId>bom-2.462.x</artifactId>
+                <version>3221.ve8f7b_fdd149d</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <dependency>
-            <!-- Waiting for a release of https://github.com/jenkinsci/plugin-pom/pull/1004 -->
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <version>5.0.0</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>ionicons-api</artifactId>

src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java

@@ -1123,7 +1123,7 @@ public String getFlowGraphDataAsHtml() {
 
     @Override public void doConsoleText(StaplerRequest req, StaplerResponse rsp) throws IOException {
         rsp.setContentType("text/plain;charset=UTF-8");
-        try (OutputStream os = rsp.getCompressedOutputStream(req)) {
+        try (OutputStream os = rsp.getOutputStream()) {
             writeLogTo(getLogText()::writeLogTo, os);
         }
     }

src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.jelly

@@ -33,7 +33,7 @@
     <f:section title="${%Advanced Project Options}" icon="symbol-build-outline plugin-ionicons-api">
         <f:advanced>
             <f:entry title="${%Display Name}" field="displayNameOrNull">
-                <f:textbox checkUrl="'${rootURL}/checkDisplayName?displayName='+encodeURIComponent(this.value)+'&amp;jobName='+encodeURIComponent('${h.jsStringEscape(it.name)}')"/>
+                <f:textbox />
             </f:entry>
         </f:advanced>
     </f:section>

src/test/java/org/jenkinsci/plugins/workflow/job/WorkflowJobTest.java

@@ -1,6 +1,8 @@
 package org.jenkinsci.plugins.workflow.job;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -12,20 +14,30 @@
 import org.htmlunit.html.HtmlCheckBoxInput;
 import org.htmlunit.html.HtmlForm;
 import hudson.cli.CLICommandInvoker;
+import hudson.model.Executor;
 import hudson.model.Result;
 import hudson.plugins.git.GitSCM;
 import hudson.security.WhoAmI;
 import hudson.triggers.SCMTrigger;
+import java.util.Objects;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import jenkins.plugins.git.GitSampleRepoRule;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.BuildWatcher;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.RunLoadCounter;
 
 public class WorkflowJobTest {
+    private static final Logger LOGGER = Logger.getLogger(WorkflowJobTest.class.getName());
+
+    @ClassRule public static BuildWatcher watcher = new BuildWatcher();
 
     @Rule public JenkinsRule j = new JenkinsRule();
     @Rule public GitSampleRepoRule sampleRepo = new GitSampleRepoRule();
@@ -157,4 +169,35 @@ public void newBuildsShouldNotLoadOld() throws Throwable {
         });
     }
 
+    @Issue("JENKINS-73824")
+    @Test
+    public void deletionShouldWaitForBuildsToComplete() throws Throwable {
+        var p = j.createProject(WorkflowJob.class);
+        p.setDefinition(new CpsFlowDefinition(
+                """
+                try {
+                  echo 'about to sleep'
+                  sleep 999
+                } catch(e) {
+                  echo 'aborting soon'
+                  sleep 3
+                }
+                """, true));
+        var b = p.scheduleBuild2(0).waitForStart();
+        j.waitForMessage("about to sleep", b);
+        // The build isn't done and catches the interruption, so ItemDeletion.cancelBuildsInProgress should have to wait at least 3 seconds for it to complete.
+        LOGGER.info(() -> "Deleting " + p);
+        p.delete();
+        LOGGER.info(() -> "Deleted " + p);
+        // Make sure that the job really has been deleted.
+        assertThat(j.jenkins.getItemByFullName(p.getFullName()), nullValue());
+        // ItemDeletion.cancelBuildsInProgress should guarantee that the queue is empty at this point.
+        var executables = Stream.of(j.jenkins.getComputers())
+                .flatMap(c -> c.getAllExecutors().stream())
+                .map(Executor::getCurrentExecutable)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+        assertThat(executables, empty());
+    }
+
 }