From 9048d6002ffb1fcaa976e26c78dde3f41d950011 Mon Sep 17 00:00:00 2001 From: Marko Budiselic Date: Fri, 17 Mar 2017 13:37:55 +0100 Subject: [PATCH] Run script has to be runnable in the jenkins environment. Summary: Run script has to be runnable in the jenkins environment. Reviewers: matej.gradicek Reviewed By: matej.gradicek Subscribers: buda Differential Revision: https://phabricator.memgraph.io/D141 --- run | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/run b/run index 34c508570..49853ce4e 100755 --- a/run +++ b/run @@ -28,8 +28,8 @@ memgraph_src_dir=${script_dir}/dbms/memgraph memgraph_build_dir=${script_dir}/dbms/memgraph/build # compile memgraph -if ${memgraph_compile} ; then cd ${memgraph_build_dir} +if ${memgraph_compile} ; then cmake .. make -j8 make copy_hardcoded_queries @@ -42,9 +42,10 @@ if [ ! -d "ve3" ]; then virtualenv -p python3 ve3 fi source ve3/bin/activate -pip3 install --upgrade pip3 +pip3 install --upgrade pip pip3 install -r requirements.txt +cd ${memgraph_build_dir} # binary is available after the build binary_name=$(find ${memgraph_build_dir}/ -maxdepth 1 -executable -name "memgraph*") # get full path to memgraph config @@ -53,8 +54,8 @@ config_path="${memgraph_src_dir}/config/memgraph.yaml" MEMGRAPH_CONFIG=${config_path} ${binary_name} & function cleanup_and_exit { - pkill -9 -f "${binary_name}" - exit $1 + pkill -9 -f "${binary_name}" + exit $1 } # the script has to be carefull because one process has been detached @@ -67,7 +68,7 @@ cd ${script_dir}/tests/pilot_dressipi python run.py exit_code=$? if [[ ${exit_code} != 0 ]]; then - cleanup_and_exit ${exit_code} + cleanup_and_exit ${exit_code} fi # run TCK test