diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2018-03-07 16:03:18 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2018-03-07 20:15:25 +0000 |
| commit | 728b59403d2ddedb8cfc2450e43d58d9ae8aad60 (patch) | |
| tree | 61d26b893a5112b3b6b46c999883129f602d8f7e /bootstrap.sh | |
| parent | 515f7c741fc0195e85b77e063a01a39d1a8b95bb (diff) | |
FIX: Bootstrap.sh for functional VIRL jobs
- Fix the path of temporary result files to workspace instead of
/run/shm
Change-Id: I4819ef5d6371412a91b6736aa36b223df38eacac
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 809fd53177..d9c41c5ffb 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -32,7 +32,6 @@ if [ -f "/etc/redhat-release" ]; then VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER_CENTOS) VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS) VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS) - SHARED_MEMORY_PATH="/dev/shm" else DISTRO="UBUNTU" export DEBIAN_FRONTEND=noninteractive @@ -47,7 +46,6 @@ else VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER_UBUNTU) VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_UBUNTU) VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU) - SHARED_MEMORY_PATH="/run/shm" fi VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30") @@ -350,7 +348,7 @@ function run_test_set() { local local_run_rc=$? set -x - echo ${local_run_rc} > ${SHARED_MEMORY_PATH}/rc_test_run${nr} + echo ${local_run_rc} > ${LOG_PATH}/rc_test_run${nr} } set +x @@ -396,13 +394,13 @@ RC=0 for index in "${!VIRL_SERVER[@]}"; do echo "Test_set${index} log:" cat ${LOG_PATH}/test_run${index}.log - RC_PARTIAL_RUN=$(cat ${SHARED_MEMORY_PATH}/rc_test_run${index}) + RC_PARTIAL_RUN=$(cat ${LOG_PATH}/rc_test_run${index}) if [ -z "$RC_PARTIAL_RUN" ]; then echo "Failed to retrieve return code from test run ${index}" exit 1 fi RC=$((RC+RC_PARTIAL_RUN)) - rm -f ${SHARED_MEMORY_PATH}/rc_test_run${index} + rm -f ${LOG_PATH}/rc_test_run${index} rm -f ${LOG_PATH}/test_run${index}.log echo done |