ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [25/34] ambari git commit: AMBARI-20756. Update docker volumes for Ambari logsearch integration test module (oleewere)
Date Mon, 17 Apr 2017 20:18:19 GMT
AMBARI-20756. Update docker volumes for Ambari logsearch integration test module (oleewere)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/86c30589
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86c30589
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86c30589

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 86c305897b054a50a36e63a5c98ea5d2c47890be
Parents: e9cf9dd
Author: oleewere <oleewere@gmail.com>
Authored: Thu Apr 13 13:57:25 2017 +0200
Committer: oleewere <oleewere@gmail.com>
Committed: Fri Apr 14 13:05:12 2017 +0200

----------------------------------------------------------------------
 .../ambari/logsearch/steps/LogSearchDockerSteps.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/86c30589/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchDockerSteps.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchDockerSteps.java
b/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchDockerSteps.java
index 5f8f9bf..91e0b10 100644
--- a/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchDockerSteps.java
+++ b/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/LogSearchDockerSteps.java
@@ -81,14 +81,16 @@ public class LogSearchDockerSteps {
       Volume testConfigVolume = new Volume("/root/test-config");
       Volume ambariVolume = new Volume("/root/ambari");
       Volume logfeederClassesVolume = new Volume("/root/ambari/ambari-logsearch/ambari-logsearch-logfeeder/target/package/classes");
-      Volume logsearchClassesVolume = new Volume("/root/ambari/ambari-logsearch/ambari-logsearch-portal/target/package/classes");
-      Volume logsearchWebappVolume = new Volume("/root/ambari/ambari-logsearch/ambari-logsearch-portal/target/package/classes/webapps/app");
+      Volume logsearchClassesVolume = new Volume("/root/ambari/ambari-logsearch/ambari-logsearch-server/target/package/classes");
+      Volume logsearchWebappVolume = new Volume("/root/ambari/ambari-logsearch/ambari-logsearch-server/target/package/classes/webapps/app");
+      Volume logsearchWebappLibsVolume = new Volume("/root/ambari/ambari-logsearch/ambari-logsearch-server/target/package/classes/webapps/app/libs/bower");
       Bind testLogsBind = new Bind(ambariFolder +"/ambari-logsearch/docker/test-logs", testLogsVolume);
       Bind testConfigBind = new Bind(ambariFolder +"/ambari-logsearch/docker/test-config",
testConfigVolume);
       Bind ambariRootBind = new Bind(ambariFolder, ambariVolume);
       Bind logfeederClassesBind = new Bind(ambariFolder + "/ambari-logsearch/ambari-logsearch-logfeeder/target/classes",
logfeederClassesVolume);
-      Bind logsearchClassesBind = new Bind(ambariFolder + "/ambari-logsearch/ambari-logsearch-portal/target/classes",
logsearchClassesVolume);
-      Bind logsearchWebappBind = new Bind(ambariFolder + "/ambari-logsearch/ambari-logsearch-portal/src/main/webapp",
logsearchWebappVolume);
+      Bind logsearchClassesBind = new Bind(ambariFolder + "/ambari-logsearch/ambari-logsearch-server/target/classes",
logsearchClassesVolume);
+      Bind logsearchWebappBind = new Bind(ambariFolder + "/ambari-logsearch/ambari-logsearch-web/src/main/webapp",
logsearchWebappVolume);
+      Bind logsearchWebappLibsBind = new Bind(ambariFolder + "/ambari-logsearch/ambari-logsearch-web/target/libs",
logsearchWebappLibsVolume);
 
       // port bindings
       Ports ports = new Ports();
@@ -102,8 +104,8 @@ public class LogSearchDockerSteps {
       CreateContainerResponse createResponse = dockerClient.createContainerCmd("ambari-logsearch:v1.0")
         .withHostName("logsearch.apache.org")
         .withName("logsearch")
-        .withVolumes(testLogsVolume, testConfigVolume, ambariVolume, logfeederClassesVolume,
logsearchClassesVolume, logsearchWebappVolume)
-        .withBinds(testLogsBind, testConfigBind, ambariRootBind, logfeederClassesBind, logsearchClassesBind,
logsearchWebappBind)
+        .withVolumes(testLogsVolume, testConfigVolume, ambariVolume, logfeederClassesVolume,
logsearchClassesVolume, logsearchWebappVolume, logsearchWebappLibsVolume)
+        .withBinds(testLogsBind, testConfigBind, ambariRootBind, logfeederClassesBind, logsearchClassesBind,
logsearchWebappBind, logsearchWebappLibsBind)
         .withExposedPorts(
           new ExposedPort(StoryDataRegistry.INSTANCE.getLogsearchPort()),
           new ExposedPort(5005),


Mime
View raw message