X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=src%2Fuse_cases%2Fseba_on_arm%2Ftest%2Fponsim%2Ftest.sh;fp=src%2Fuse_cases%2Fseba_on_arm%2Ftest%2Fponsim%2Ftest.sh;h=8a309058801735d6814bc5d821ca515c8a2a8686;hb=5f2c10a6add76171029b34f600afafb78e938471;hp=0d3c64db846538ea5f989ee9612187f71a9bd069;hpb=7cd1361ac2e8f3de4ac436129d6ce0ba2785e633;p=iec.git diff --git a/src/use_cases/seba_on_arm/test/ponsim/test.sh b/src/use_cases/seba_on_arm/test/ponsim/test.sh index 0d3c64d..8a30905 100755 --- a/src/use_cases/seba_on_arm/test/ponsim/test.sh +++ b/src/use_cases/seba_on_arm/test/ponsim/test.sh @@ -16,13 +16,14 @@ KUBE_DIR="${KUBE_DIR:-${PWD}/.kube}" K8S_MASTER_IP="${K8S_MASTER_IP:-127.0.0.1}" TEST_USER="${TEST_USER:-ubuntu}" -cont_id= -trap f_clean INT EXIT +rm -rf results +mkdir -m 777 results + +trap f_clean EXIT f_clean(){ - echo "Cleaning up after ${cont_id}" - docker kill "${cont_id}" - docker rm "${cont_id}" + echo "Execution finished, cleaning up" + chmod -R 777 results } if ! [ -d "${KUBE_DIR}" ] @@ -32,21 +33,12 @@ then fi docker pull "${CORD_IMG}" -DOCKER_CMD="docker run -id -e K8S_MASTER_IP=${K8S_MASTER_IP} \ - -e USER=${TEST_USER} \ - -v ${basepath}/docker_run.sh:/workspace/docker_run.sh \ - -v ${KUBE_DIR}:/workspace/.kube \ - ${CORD_IMG} /bin/bash" -if cont_id=$(eval "${DOCKER_CMD}") -then - echo "Starting SIAB.robot in ${cont_id}" - docker exec "${cont_id}" sudo cp /workspace/docker_run.sh \ - "/home/${TEST_USER}/docker_run.sh" - docker exec "${cont_id}" sudo chown "${TEST_USER}:${TEST_USER}" \ - "/home/${TEST_USER}/docker_run.sh" - docker exec "${cont_id}" "/home/${TEST_USER}/docker_run.sh" -else - echo "Failed to execute docker command ${cont_id}" - exit 1 -fi +docker run --rm -it \ + -e K8S_MASTER_IP=${K8S_MASTER_IP} \ + -e USER=${TEST_USER} \ + -v ${basepath}/docker_run.sh:/workspace/docker_run.sh \ + -v ${KUBE_DIR}:/workspace/.kube \ + -v ${PWD}/results:/workspace/results \ + ${CORD_IMG} \ + /workspace/docker_run.sh