X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fci%2Fcheck_manual_usage_example.sh;h=027284de0d8149ac71fc7eb9138e8152e1a51b3f;hb=736c4aa0e346c645eaabbb580fc581ca07a19f7c;hp=6b9bc3fa3832684a46a30bea35161868c9c6e269;hpb=6a5c2ec0afb49c33c123d6a16bb2190608c47704;p=osm%2Fvim-emu.git diff --git a/utils/ci/check_manual_usage_example.sh b/utils/ci/check_manual_usage_example.sh index 6b9bc3f..027284d 100755 --- a/utils/ci/check_manual_usage_example.sh +++ b/utils/ci/check_manual_usage_example.sh @@ -14,6 +14,7 @@ W() { chmod +x ${SUBF} cat > ${SUBF} <<- EOF #!/bin/bash -e + set -x while true; do if strings screenlog.0 | grep -m 1 "\${1}"; then exit 0 @@ -21,6 +22,7 @@ W() { sleep 0.5s done EOF + cat ${SUBF} timeout -k 3s ${T} ${SUBF} "${1}" local RES=$? rm -f ${SUBF} @@ -39,8 +41,14 @@ if ! screen --version | grep 'Screen version'; then sudo apt-get install -y screen screen --version | grep 'Screen version' fi +if ! timeout --version; then + # Install coreutils for the timeout command + sudo apt-get update -qq -y + sudo apt-get install -y coreutils + timeout --version +fi # Initial cleanup -pkill -f 'screen -L -S sonemu' || true +pkill -f 'SCREEN -L -S sonemu' || true screen -wipe || true rm -f screenlog.0 @@ -50,7 +58,7 @@ screen -L -S sonemu -d -m python src/emuvim/examples/simple_topology.py # Setup screen for immediate flusing screen -S sonemu -X logfile flush 0 # Wait for the cli to start -W '^*** Starting CLI:' +W '^*** Starting CLI:' 60s # Print nodes Cmd 'nodes' # Start vnf1