Repository: hive Updated Branches: refs/heads/HIVE-19429 a2b2e125e -> a23aa7acb
Added docker exec path Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/a23aa7ac Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/a23aa7ac Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/a23aa7ac Branch: refs/heads/HIVE-19429 Commit: a23aa7acbfb5530efd0b3c81af9207c1b148f1c9 Parents: a2b2e12 Author: Vihang Karajgaonkar <vih...@cloudera.com> Authored: Mon Jun 25 22:33:58 2018 -0700 Committer: Vihang Karajgaonkar <vih...@cloudera.com> Committed: Mon Jun 25 22:33:58 2018 -0700 ---------------------------------------------------------------------- .../ptest/execution/containers/DockerClient.java | 15 ++++++++------- .../hive/ptest/execution/TestPtestOnDockers.java | 2 ++ 2 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a23aa7ac/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/containers/DockerClient.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/containers/DockerClient.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/containers/DockerClient.java index fe1a547..e529881 100644 --- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/containers/DockerClient.java +++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/containers/DockerClient.java @@ -37,9 +37,12 @@ public class DockerClient implements ContainerClient { private static final String DOCKER_SCRATCH_DIR = HOME_DIR + File.separatorChar + "scratch" + File.separatorChar; private static Logger logger; private final ContainerClientContext context; + private final String DOCKER_EXEC; public DockerClient(ContainerClientContext context) { logger = context.getLogger(); this.context = context; + String dockerPath = context.getTemplateDefaults().get("dockerExecPath"); + DOCKER_EXEC = dockerPath == null ? "/usr/bin/docker" : dockerPath; } @Override @@ -63,7 +66,7 @@ public class DockerClient implements ContainerClient { long seconds = TimeUnit.SECONDS.convert(toWait, unit); logger.info("Building image"); String dockerBuildCommand = - new StringBuilder("docker build") + new StringBuilder(DOCKER_EXEC + " build") .append(" --memory " + "2g") .append(" --memory-swap " + "-1") .append(" --tag " + imageName()) @@ -86,7 +89,7 @@ public class DockerClient implements ContainerClient { @Override public String getRunContainerCommand(String containerName, TestBatch batch) { - return new StringBuilder("/usr/local/bin/docker run") + return new StringBuilder(DOCKER_EXEC + " run") .append(" --memory " + "2G") .append(" --name " + containerName) //.append(" -d") @@ -110,8 +113,7 @@ public class DockerClient implements ContainerClient { @Override public String getCopyTestLogsCommand(String containerName, String dir) { String containerLogDir = context.getTemplateDefaults().get("containerLogDir"); - //TODO get path for docker executable from context - return new StringBuilder("/usr/local/bin/docker cp") + return new StringBuilder(DOCKER_EXEC + " cp") .append(" " + containerName + ":" + containerLogDir) .append(" " + dir) .toString(); @@ -119,10 +121,9 @@ public class DockerClient implements ContainerClient { @Override public String getStopContainerCommand(String containerName, boolean forceRemove) { - //TODO get path for docker executable from context - StringBuilder ret = new StringBuilder("/usr/local/bin/docker stop " + containerName); + StringBuilder ret = new StringBuilder(DOCKER_EXEC + " stop " + containerName); if (forceRemove) { - ret.append("; /usr/local/bin/docker rm " + containerName); + ret.append("; " + DOCKER_EXEC + " rm " + containerName); } return ret.toString(); } http://git-wip-us.apache.org/repos/asf/hive/blob/a23aa7ac/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPtestOnDockers.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPtestOnDockers.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPtestOnDockers.java index 4f9445e..931b3e8 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPtestOnDockers.java +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPtestOnDockers.java @@ -145,6 +145,7 @@ public class TestPtestOnDockers { private static final String REAL_REPOSITORY = "https://github.com/apache/hive.git";; private static final String REAL_REPOSITORY_NAME = "apache-hive"; private static final String REAL_MAVEN_OPTS = "-Xmx2048m"; + private static final String DOCKER_EXEC_PATH = "/usr/local/bin/docker"; private SSHCommandExecutor sshCommandExecutor; private MockRSyncCommandExecutor rsyncCommandExecutor; private static final String BUILD_TAG = "docker-ptest-tag"; @@ -178,6 +179,7 @@ public class TestPtestOnDockers { .put("repositoryName", REAL_REPOSITORY_NAME) .put("mavenEnvOpts", REAL_MAVEN_OPTS) .put("containerLogDir", "/tmp/testlogs") + .put("dockerExecPath", DOCKER_EXEC_PATH) .build(); host = new Host(HOST, USER, new String[] { LOCAL_DIR }, 2); }
