Merge branch 'ci' into no-BeanBuilder

Author: jglick

src/test/java/hudson/security/docker/MultiServerTest.java

@@ -1,5 +1,6 @@
 package hudson.security.docker;
 
+import hudson.Functions;
 import hudson.model.User;
 import hudson.security.LDAPEmbeddedTest;
 import hudson.security.LDAPSecurityRealm;
@@ -23,12 +24,19 @@
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeFalse;
+import org.junit.BeforeClass;
 
 /**
  * Tests connecting to two different servers
  */
 @LDAPTestConfiguration
 public class MultiServerTest {
+
+    @BeforeClass public static void linuxOnly() {
+        assumeFalse("Windows CI builders now have Docker installed…but it does not support Linux images", Functions.isWindows());
+    }
+
     @Rule
     public DockerRule<PlanetExpressTest.PlanetExpress> docker = new DockerRule<>(PlanetExpressTest.PlanetExpress.class);
     public JenkinsRule j = new JenkinsRule();

src/test/java/hudson/security/docker/PlanetExpressTest.java

@@ -1,5 +1,6 @@
 package hudson.security.docker;
 
+import hudson.Functions;
 import hudson.security.LDAPSecurityRealm;
 import hudson.tasks.MailAddressResolver;
 import hudson.util.Secret;
@@ -14,12 +15,18 @@
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeFalse;
+import org.junit.BeforeClass;
 
 /**
  * Tests the plugin when logging in to rroemhild/test-openldap
  */
 public class PlanetExpressTest {
 
+    @BeforeClass public static void linuxOnly() {
+        assumeFalse("Windows CI builders now have Docker installed…but it does not support Linux images", Functions.isWindows());
+    }
+
     @Rule
     public DockerRule<PlanetExpress> docker = new DockerRule<>(PlanetExpress.class);
     @Rule