projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increasing the timeout while waiting for containernet prompt
[osm/vim-emu.git]
/
utils
/
ci
/
check_manual_usage_example.sh
diff --git
a/utils/ci/check_manual_usage_example.sh
b/utils/ci/check_manual_usage_example.sh
index
be69d3f
..
027284d
100755
(executable)
--- 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
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
while true; do
if strings screenlog.0 | grep -m 1 "\${1}"; then
exit 0
@@
-21,6
+22,7
@@
W() {
sleep 0.5s
done
EOF
sleep 0.5s
done
EOF
+ cat ${SUBF}
timeout -k 3s ${T} ${SUBF} "${1}"
local RES=$?
rm -f ${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
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
# Initial cleanup
-pkill
'screen
' || true
+pkill
-f 'SCREEN -L -S sonemu
' || true
screen -wipe || true
rm -f screenlog.0
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
# 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
# Print nodes
Cmd 'nodes'
# Start vnf1