diff --git a/pom.xml b/pom.xml index f947142a..ad22eefc 100644 --- a/pom.xml +++ b/pom.xml @@ -531,7 +531,7 @@ 2.22.1 - -Xmx1024m -Xms1024m -XX:MaxPermSize=512m -Djdk.net.URLClassPath.disableClassPathURLCheck=true + -Xmx1024m -Xms1024m -Djdk.net.URLClassPath.disableClassPathURLCheck=true diff --git a/smoke-test/src/main/java/org/opennms/alec/smoke/util/ssh/SshClient.java b/smoke-test/src/main/java/org/opennms/alec/smoke/util/ssh/SshClient.java index ced2b854..b5656441 100644 --- a/smoke-test/src/main/java/org/opennms/alec/smoke/util/ssh/SshClient.java +++ b/smoke-test/src/main/java/org/opennms/alec/smoke/util/ssh/SshClient.java @@ -40,7 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.jcraft.jsch.Channel; +import com.jcraft.jsch.ChannelShell; import com.jcraft.jsch.JSch; import com.jcraft.jsch.Session; @@ -62,7 +62,7 @@ public class SshClient implements AutoCloseable { private final JSch jsch = new JSch(); private Session session; - private Channel channel; + private ChannelShell channel; private InputStream stdout; private InputStream stderr; @@ -92,7 +92,9 @@ public PrintStream openShell() throws Exception { session.setConfig(config); session.connect(); - channel = session.openChannel("shell"); + channel = (ChannelShell) session.openChannel("shell"); + channel.setPty(true); + channel.setPtyType("xterm", 200, 40, 1024, 768); // width=200 columns, height=40 rows, optional pixel size stdout = channel.getInputStream(); stderr = channel.getExtInputStream(); channel.connect(timeout); diff --git a/smoke-test/src/main/resources/docker_fixed_images b/smoke-test/src/main/resources/docker_fixed_images index 3783ba67..11032858 100644 --- a/smoke-test/src/main/resources/docker_fixed_images +++ b/smoke-test/src/main/resources/docker_fixed_images @@ -8,5 +8,5 @@ kafka=confluentinc/cp-kafka:7.0.0 postgres=postgres:10.7-alpine # Note this tag version should match the selenium version in the POM selenium=selenium/standalone-chrome-debug:3.4.0 -sentinel=opennms/sentinel:30.0.0 -opennms=opennms/horizon:30.0.0 +sentinel=opennms/sentinel:33.1.6 +opennms=opennms/horizon:33.1.6