chore: bump testcontainers version (#52)

jenkinsci · Oct 4, 2020 · 350a4da · 350a4da
1 parent 7a4cbaf
commit 350a4da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.8.3</version>
+      <version>1.14.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/test/com/trilead/ssh2/SFTPClientTest.java b/test/com/trilead/ssh2/SFTPClientTest.java
@@ -5,7 +5,6 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.Rule;
 import org.junit.Test;
-import org.testcontainers.containers.GenericContainer;
 
 import java.io.InputStream;
 import java.io.OutputStream;

diff --git a/test/com/trilead/ssh2/channel/ConnectionRule.java b/test/com/trilead/ssh2/channel/ConnectionRule.java
@@ -1,12 +1,11 @@
 package com.trilead.ssh2.channel;
 
 import com.trilead.ssh2.Connection;
+import org.apache.commons.io.IOUtils;
 import org.junit.Rule;
 import org.junit.rules.ExternalResource;
 import org.testcontainers.containers.GenericContainer;
 
-import java.io.File;
-
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -17,39 +16,9 @@
 public class ConnectionRule extends ExternalResource {
     public static final String USER = "jenkins";
     public static final int SSH_PORT = 22;
-    public static final String privateKey = "-----BEGIN RSA PRIVATE KEY-----\n" +
-            "MIIEowIBAAKCAQEA3x7Q+RNxkeqlDAbosRm7tXrFLuN1fcyZ4ERLEume/JLVSYny\n" +
-            "BM4v0KhKMkTFsyVXiMukHCS0/mYnfTvjGld76pzYdoXSzncc8zZruDnMVgzAUoSS\n" +
-            "P1H5wtL6ft6ZS1aHXhWte5TmkO4GDXilMwjrgwWscUhD6YhasfDiEVvaCNVnaIYt\n" +
-            "KMhBLY1Mb6ZMuFnqbSMWWZ9S2B49RMk/QL6XS29LeCqleTl2pd5UEFGidhiPBj6J\n" +
-            "WZ/dZO/cNnNvhF37L5SiqO5lLBTYcCtDgZyXsY7jfhUGl5yRbGKcTkNiRh/bkpKT\n" +
-            "PiAcXBAx0Hv1HDGN6g+PV/rch7dD/rD4tRORDQIDAQABAoIBAEwcYwTUUSWJeYvE\n" +
-            "v5PKR3H8007PYMDtDoCmS0XEU+us2v0fBWQGQeFXxxemxhn6XwXXEcBX9TXi+w2J\n" +
-            "ZEsUFL1Pi7fCpsqvbzy4D77kWIPyDZkYiBr5h82h0rl8jaZZegvqMSe6/3vo9j+a\n" +
-            "LCBgppYnVU+/aws67FVO6o8pWhMwteoemjhKkgPYRQMXDX4tNb1DiGLP8+tAridZ\n" +
-            "jTF8Kb2g5xbypbkO2cj7/MplXWhdkEV72xCfl2MbS2jH8Vfi+lUiBENCDaTuaJlO\n" +
-            "JCBSGIr39YMbxScAEcsdhtlb1dR4bYIeSUDNSTntSZq6cz3ue4NhhY3/8Zt66fBR\n" +
-            "CFxUqwECgYEA8RTutNAKji8wQ/tmmUqJ7Tl+R8sBFPYh/A+fnCy1GYA/V5m9hJR8\n" +
-            "QPbsaqTvIEZa+RffcWgk0+agBqhOeu7dGov09Tt6xZx7IbomMx+P3kU78vcPxvM2\n" +
-            "Sbi9DnMvDRY/RKLho2ZlHGWxK0rLcfVw+Gu2Uxt1vGpT5eQ7s/poGRECgYEA7O1Z\n" +
-            "xJPdgbnzlPFuXmb06IQEA9iuA07mqjDQiqE8b0DUA+btDVal0SUZgxx8NPyLDmhB\n" +
-            "UIGM5o9GRzHbL6xm4Y3RIUw3kEYhOyJoNr0hAXYHW2ZBemxSNW9n+IA4Bgikm/IT\n" +
-            "SSvjvg8fXOisAD0KCZYEfJjMZsBmSGakcGksGD0CgYEAoqtqKk0aYjhLDAQNha+7\n" +
-            "A3vAzraW40r1QXxVSW8NP8i+dOCC9Xuvn7I9cfQaeh+e8Ob/2SjZeLXsErHsSpz0\n" +
-            "Sh5XykU5IS/mEarmbaaFUAhNXDMCzU58uh/SSXbFL8JsLGbvc277GL8xXbHZNurT\n" +
-            "MHyViNxFhD4GoF9xPY7gQNECgYAg8tkbB100n0GKoxCwPC0u8L0GM+nvN9fIL0Wx\n" +
-            "Ib8f0aoqaMDqq/QfY8NqglmbnMtR05nRslJ/9cjWOc67kIQ2NdyxfsHzZG1WpfBM\n" +
-            "PH0MkPdw9IWCmvHL0JRq8JnZ7PXHYiDgeiQP2FaKOylAVzzAHIa/NRin6XXP98ZC\n" +
-            "g73IGQKBgGybl0Ir9XkPtZ41rFHN8m7CRH5Vvd9lzRnWCfhpkejkWecYtl7cz56G\n" +
-            "V0caNcOvjvZ790lGOxMz4yymS8OIQ6Wdjf2ds66agQn9bmwKZKhjJzGP6xoFWEOu\n" +
-            "nePTvdCtsGHcSCn3oNLPONIslk72Dlp21EkKIjZkBoz2nAxwO5zf\n" +
-            "-----END RSA PRIVATE KEY-----";
-    public static final String publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfHtD5E3GR6qUMBuixGbu1esUu43V9zJngREsS6Z78ktVJifIEzi/QqEoyRMWzJVeIy6QcJLT+Zid9O+MaV3vqnNh2hdLOdxzzNmu4OcxWDMBShJI/UfnC0vp+3plLVodeFa17lOaQ7gYNeKUzCOuDBaxxSEPpiFqx8OIRW9oI1Wdohi0oyEEtjUxvpky4WeptIxZZn1LYHj1EyT9AvpdLb0t4KqV5OXal3lQQUaJ2GI8GPolZn91k79w2c2+EXfsvlKKo7mUsFNhwK0OBnJexjuN+FQaXnJFsYpxOQ2JGH9uSkpM+IBxcEDHQe/UcMY3qD49X+tyHt0P+sPi1E5EN user@test";
 
     @Rule
-    public GenericContainer sshContainer = new GenericContainer("jenkins/ssh-slave")
-            .withEnv("JENKINS_SLAVE_SSH_PUBKEY", publicKey)
-            .withExposedPorts(SSH_PORT);
+    public GenericContainer sshContainer = new GenericContainer("jenkins/ssh-agent");
 
     private Connection connection;
 
@@ -61,7 +30,11 @@ public Connection getConnection() throws Exception {
 
     @Override
     public void before() throws Exception {
-        sshContainer.start();
+        String publicKey = IOUtils.toString(getClass().getResourceAsStream("../crypto/cipher/key.pem.pub"));
+        String privateKey =  IOUtils.toString(getClass().getResourceAsStream("../crypto/cipher/key.pem"));
+        sshContainer.withEnv("JENKINS_AGENT_SSH_PUBKEY", publicKey)
+                    .withExposedPorts(SSH_PORT)
+                    .start();
 
         int port = sshContainer.getMappedPort(SSH_PORT);
         String ip = sshContainer.getContainerIpAddress();