aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2017-07-13 15:25:08 +0200
committerjose.lausuch <jose.lausuch@ericsson.com>2017-07-13 15:31:18 +0200
commitbd933de68d560a4f412ef0b8ef0a7928cb4f7bfa (patch)
tree8de3b373442907fd039a7aa668323e46fce8067a
parentbd900ddc3911c4c2bd0aa738ed48db0a075bcebb (diff)
Stop installing packages from test execution
These packages are available in the Functest image thanks to the requirements installed here [1] [1] https://git.opnfv.org/functest/tree/docker/thirdparty-requirements.txt Change-Id: I5e8814de6e8f11e59cfef61ee3c0dbc0651f55ff Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
-rwxr-xr-xtests/run.sh13
-rwxr-xr-xtests/run_multinode.sh13
2 files changed, 4 insertions, 22 deletions
diff --git a/tests/run.sh b/tests/run.sh
index 89f2d3f..7da8f36 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -24,19 +24,14 @@ client1_log=./tests/logdata/client1.log
client2_log=./tests/logdata/client2.log
server_log=./tests/logdata/server.log
-install_dependency() {
- sudo pip install tosca-parser
- sudo pip install heat-translator
-}
-
start_server() {
- pgrep -f "python DominoServer.py" && return 0
+ pgrep -f "python DominoServer.py" && return 0
python DominoServer.py --log "$LOGLEVEL" > "$server_log" 2>&1 &
}
stop_server() {
- pgrep -f "python DominoServer.py" || return 0
+ pgrep -f "python DominoServer.py" || return 0
kill $(pgrep -f "python DominoServer.py")
#cat server.log
}
@@ -103,10 +98,6 @@ echo "Cleaning residue files and folders from previous runs..."
clean_directories
sleep 1
-echo "Installing dependencies..."
-install_dependency
-sleep 1
-
echo "Launching Domino Server..."
start_server
sleep 1
diff --git a/tests/run_multinode.sh b/tests/run_multinode.sh
index 89f2d3f..7da8f36 100755
--- a/tests/run_multinode.sh
+++ b/tests/run_multinode.sh
@@ -24,19 +24,14 @@ client1_log=./tests/logdata/client1.log
client2_log=./tests/logdata/client2.log
server_log=./tests/logdata/server.log
-install_dependency() {
- sudo pip install tosca-parser
- sudo pip install heat-translator
-}
-
start_server() {
- pgrep -f "python DominoServer.py" && return 0
+ pgrep -f "python DominoServer.py" && return 0
python DominoServer.py --log "$LOGLEVEL" > "$server_log" 2>&1 &
}
stop_server() {
- pgrep -f "python DominoServer.py" || return 0
+ pgrep -f "python DominoServer.py" || return 0
kill $(pgrep -f "python DominoServer.py")
#cat server.log
}
@@ -103,10 +98,6 @@ echo "Cleaning residue files and folders from previous runs..."
clean_directories
sleep 1
-echo "Installing dependencies..."
-install_dependency
-sleep 1
-
echo "Launching Domino Server..."
start_server
sleep 1