seba_on_arm: Fix docker run without TTY

[iec.git] / src / use_cases / seba_on_arm / test / ponsim / test.sh

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 7e984f3..65247f2 100755 (executable)
--- a/src/use_cases/seba_on_arm/test/ponsim/test.sh
+++ b/src/use_cases/seba_on_arm/test/ponsim/test.sh
@@ -1,22 +1,29 @@
 #!/bin/bash
-# shellcheck disable=SC2016
+##############################################################################
+# Copyright (c) 2020 Akraino IEC Team.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 
 set -ex
 
 basepath=$(cd "$(dirname "$0")"; pwd)
 
-CORD_IMG="${CORD_IMG:-iecedge/cord-tester:latest}"
+CORD_IMG="${CORD_IMG:-iecedge/cord-tester:cord-7.0}"
 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"
+  sudo chmod -R 777 results
 }
 
 if ! [ -d "${KUBE_DIR}" ]
@@ -26,17 +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}" /workspace/docker_run.sh
-else
-  echo "Failed to execute docker command ${cont_id}"
-  exit 1
-fi
+docker run --rm \
+    -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