Merge pull request #12 from MarkEWaite/skip-docker-test-when-docker-unavailable

Skip Docker test when Docker is not available

Author: jtnord

Jenkinsfile

@@ -4,7 +4,7 @@
 */
 buildPlugin(
   forkCount: '1C', // run this number of tests in parallel for faster feedback.  If the number terminates with a 'C', the value will be multiplied by the number of available CPU cores
-  useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
+  useContainerAgent: false, // Need testcontainer in EddsaTest
   configurations: [
     [platform: 'linux', jdk: 21],
     [platform: 'windows', jdk: 17],

src/test/java/io/jenkins/plugins/eddsa_api/EddsaTest.java

@@ -1,6 +1,7 @@
 package io.jenkins.plugins.eddsa_api;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey;
 import com.cloudbees.plugins.credentials.CredentialsScope;
@@ -21,6 +22,7 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.RealJenkinsRule;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
@@ -37,26 +39,32 @@ public class EddsaTest implements Serializable {
     public static final String USER = "jenkins";
 
     @Rule
-    public transient GenericContainer agentContainer = new GenericContainer(new ImageFromDockerfile(
-                            SSH_AGENT_NAME, false)
-                    .withFileFromClasspath(
-                            SSH_AUTHORIZED_KEYS,
-                            AGENTS_RESOURCES_PATH + "/" + SSH_AGENT_NAME + "/" + SSH_AUTHORIZED_KEYS)
-                    .withFileFromClasspath(
-                            SSH_KEY_PATH, AGENTS_RESOURCES_PATH + "/" + SSH_AGENT_NAME + "/" + SSH_KEY_PATH)
-                    .withFileFromClasspath(
-                            SSH_KEY_PUB_PATH, AGENTS_RESOURCES_PATH + "/" + SSH_AGENT_NAME + "/" + SSH_KEY_PUB_PATH)
-                    .withFileFromClasspath(
-                            SSH_SSHD_CONFIG, AGENTS_RESOURCES_PATH + "/" + SSH_AGENT_NAME + "/" + SSH_SSHD_CONFIG)
-                    .withFileFromClasspath(DOCKERFILE, AGENTS_RESOURCES_PATH + "/" + SSH_AGENT_NAME + "/" + DOCKERFILE))
-            .withExposedPorts(22);
+    public transient GenericContainer agentContainer = !DockerClientFactory.instance()
+                    .isDockerAvailable()
+            ? null
+            : new GenericContainer(new ImageFromDockerfile(SSH_AGENT_NAME, false)
+                            .withFileFromClasspath(
+                                    SSH_AUTHORIZED_KEYS,
+                                    AGENTS_RESOURCES_PATH + "/" + SSH_AGENT_NAME + "/" + SSH_AUTHORIZED_KEYS)
+                            .withFileFromClasspath(
+                                    SSH_KEY_PATH, AGENTS_RESOURCES_PATH + "/" + SSH_AGENT_NAME + "/" + SSH_KEY_PATH)
+                            .withFileFromClasspath(
+                                    SSH_KEY_PUB_PATH,
+                                    AGENTS_RESOURCES_PATH + "/" + SSH_AGENT_NAME + "/" + SSH_KEY_PUB_PATH)
+                            .withFileFromClasspath(
+                                    SSH_SSHD_CONFIG,
+                                    AGENTS_RESOURCES_PATH + "/" + SSH_AGENT_NAME + "/" + SSH_SSHD_CONFIG)
+                            .withFileFromClasspath(
+                                    DOCKERFILE, AGENTS_RESOURCES_PATH + "/" + SSH_AGENT_NAME + "/" + DOCKERFILE))
+                    .withExposedPorts(22);
 
     @Rule(order = 10)
     public transient RealJenkinsRule j =
             new RealJenkinsRule().withDebugPort(8000).withDebugServer(true).withDebugSuspend(true);
 
     @Test
     public void connectionTests() throws Throwable {
+        assumeTrue(DockerClientFactory.instance().isDockerAvailable());
         String host = agentContainer.getHost();
         int port = agentContainer.getMappedPort(SSH_PORT);
         String keyPath = SSH_AGENT_NAME + "/" + SSH_KEY_PATH;