Merge branch 'master' into bugfix/JENKINS-74912

Author: basil

Jenkinsfile

@@ -6,7 +6,5 @@ buildPlugin(
   useContainerAgent: false, // Set to `false` if you need to use Docker for containerized tests
   configurations: [
     [platform: 'linux', jdk: 21],
-    [platform: 'linux', jdk: 17],
-    // TODO Windows tests seem to be failing on temporary Windows CI infrastructure from https://github.com/jenkins-infra/helpdesk/issues/4490
-    //[platform: 'maven-17-windows', jdk: 17], // TODO Docker-based tests fail when using Docker on Windows. The maven-windows agents do not have Docker installed so tests that require Docker are skipped.
+    [platform: 'windows', jdk: 17],
 ])

src/test/java/org/jenkinsci/plugins/docker/workflow/DockerDSLTest.java

@@ -270,7 +270,7 @@ private static void grep(File dir, String text, String prefix, Set<String> match
     @Test public void buildWithMultiStage() {
         story.addStep(new Statement() {
             @Override public void evaluate() throws Throwable {
-                assumeDocker(DockerTestUtil.DOCKER_OS_MODE.LINUX, new VersionNumber("17.05"));
+                assumeDocker(DockerTestUtil.DockerOsMode.LINUX, new VersionNumber("17.05"));
                 WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "prj");
                 p.setDefinition(new CpsFlowDefinition(
                         "node {\n" +

src/test/java/org/jenkinsci/plugins/docker/workflow/DockerTestUtil.java

@@ -58,20 +58,20 @@ public class DockerTestUtil {
         "10.0.26100.2605"  // 2025
     );
 
-    public enum DOCKER_OS_MODE {
+    public enum DockerOsMode {
         LINUX,
         WINDOWS
     }
 
     public static void assumeDocker() throws Exception {
-        assumeDocker(DOCKER_OS_MODE.LINUX, new VersionNumber(DEFAULT_MINIMUM_VERSION));
+        assumeDocker(DockerOsMode.LINUX, new VersionNumber(DEFAULT_MINIMUM_VERSION));
     }
 
-    public static void assumeDocker(DOCKER_OS_MODE osMode) throws Exception {
+    public static void assumeDocker(DockerOsMode osMode) throws Exception {
         assumeDocker(osMode, new VersionNumber(DEFAULT_MINIMUM_VERSION));
     }
 
-    public static void assumeDocker(DOCKER_OS_MODE osMode, VersionNumber minimumVersion) throws Exception {
+    public static void assumeDocker(DockerOsMode osMode, VersionNumber minimumVersion) throws Exception {
         Launcher.LocalLauncher localLauncher = new Launcher.LocalLauncher(StreamTaskListener.NULL);
         try {
             ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -81,7 +81,7 @@ public static void assumeDocker(DOCKER_OS_MODE osMode, VersionNumber minimumVers
                 .stdout(out)
                 .start()
                 .joinWithTimeout(DockerClient.CLIENT_TIMEOUT, TimeUnit.SECONDS, localLauncher.getListener());
-            DOCKER_OS_MODE cmdOsMode = DOCKER_OS_MODE.valueOf(out.toString().trim().toUpperCase());
+            DockerOsMode cmdOsMode = DockerOsMode.valueOf(out.toString().trim().toUpperCase());
             Assume.assumeTrue("Docker working", status == 0);
             Assume.assumeTrue("Docker os mode " + osMode, osMode == cmdOsMode);
         } catch (IOException x) {

src/test/java/org/jenkinsci/plugins/docker/workflow/WithContainerStepTest.java

@@ -302,7 +302,7 @@ public class WithContainerStepTest {
     @Test public void cd() throws Exception {
         story.addStep(new Statement() {
             @Override public void evaluate() throws Throwable {
-                DockerTestUtil.assumeDocker(DockerTestUtil.DOCKER_OS_MODE.LINUX, new VersionNumber("17.12"));
+                DockerTestUtil.assumeDocker(DockerTestUtil.DockerOsMode.LINUX, new VersionNumber("17.12"));
                 WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "prj");
                 p.setDefinition(new CpsFlowDefinition(
                     "node {\n" +
@@ -501,7 +501,7 @@ private static final class Execution extends SynchronousNonBlockingStepExecution
         story.addStep(new Statement() {
             @Override public void evaluate() throws Throwable {
                 DockerTestUtil.assumeWindows();
-                DockerTestUtil.assumeDocker(DockerTestUtil.DOCKER_OS_MODE.WINDOWS);
+                DockerTestUtil.assumeDocker(DockerTestUtil.DockerOsMode.WINDOWS);
 
                 // Kernel must match when running Windows containers on docker on Windows
                 String releaseTag = DockerTestUtil.getWindowsImageTag();