Commit b4ef2705 authored by Evgeny Kusmenko's avatar Evgeny Kusmenko

Merge branch 'e/e-infrastructure' into 'master'

E/e infrastructure

See merge request !31
parents 0d23aa46 aec93123
Pipeline #191635 passed with stages
in 11 minutes and 2 seconds
......@@ -41,6 +41,11 @@ docker run \
-e "ZOO_MAX_CLIENT_CNXNS=1024" \
zookeeper:3.4
echo "waiting for zookeeper to start..."
sleep 10
# start autopilot server(RMIServer)
docker run \
--network="simulation-network" \
......@@ -60,6 +65,10 @@ docker run \
rpc-server:latest
echo "waiting for autopilot and simulator to start..."
sleep 5
cd ${CURR_DIR}
#docker build -t server-test-runner -f ./docker/TestDockerfile .
docker run \
......
......@@ -17,7 +17,7 @@
<properties>
<revision>2.2.3</revision>
<revision>2.2.4</revision>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
......
......@@ -25,7 +25,7 @@
</parent>
<properties>
<revision>2.2.3</revision>
<revision>2.2.4</revision>
<montisim.commons.version>1.0.11</montisim.commons.version>
<montisim.simulation.version>2.0.4</montisim.simulation.version>
<montisim.controller.version>1.0.4</montisim.controller.version>
......
......@@ -16,6 +16,6 @@ public class ZookeeperFactory {
zooServers = "localhost:2181";
}
LoggerFactory.getLogger(ZookeeperFactory.class).info("Initialize connection to zookeeper {}", zooServers);
return new ZkClient(zooServers, 1000);
return new ZkClient(zooServers, 10000);
}
}
......@@ -17,7 +17,7 @@
<version>${revision}</version>
<properties>
<revision>2.2.3</revision>
<revision>2.2.4</revision>
<montisim.commons.version>1.0.11</montisim.commons.version>
<montisim.simulation.version>2.0.4</montisim.simulation.version>
<montisim.controller.version>1.0.4</montisim.controller.version>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment