Skip to content

Commit

Permalink
replace serial console port 7777 as that one is used by gh action runner
Browse files Browse the repository at this point in the history
  • Loading branch information
christoph-zededa committed Jun 25, 2024
1 parent 41207fd commit c367052
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/defaults/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const (
DefaultIP = "192.168.0.1"
DefaultEVEIP = "192.168.1.2"
DefaultEserverPort = 8888
DefaultTelnetPort = 7777
DefaultTelnetPort = 17777
DefaultQemuMonitorPort = 7788
DefaultQemuNetdevSocketPort = 7790
DefaultSSHPort = 2222
Expand Down
8 changes: 4 additions & 4 deletions shell-scripts/collect-info-console.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ for i in $(seq 3); do
{
echo "eve verbose off"; echo "eve enter debug"; sleep 3;
echo "which collect-info.sh"; sleep 3
} | telnet localhost 7777 | tee telnet.stdout
} | telnet localhost 17777 | tee telnet.stdout
grep -q "/usr/bin/collect-info.sh" telnet.stdout && break
sleep 60
done
Expand All @@ -27,7 +27,7 @@ for i in $(seq 3); do
{
echo "rm -f /persist/eve-info*"; echo "/usr/bin/collect-info.sh";
sleep $((WAIT_TIME+60*(i-1)))
} | telnet localhost 7777 | tee telnet.stdout
} | telnet localhost 17777 | tee telnet.stdout
TGZNAME="$(sed -n "s/EVE info is collected '\(.*\)'/\1/p" telnet.stdout)"
[ -n "${TGZNAME}" ] && break
done
Expand All @@ -44,7 +44,7 @@ for i in $(seq 3); do
# This is fairly quick even on Github runners - around 10 seconds, but depends
# on the tarball size.
sleep $((20+60*(i-1)))
} | telnet localhost 7777 | sed -n "s/>>>\(.*\)<<</\1/p" | base64 -id > "${OUTPUT}"
} | telnet localhost 17777 | sed -n "s/>>>\(.*\)<<</\1/p" | base64 -id > "${OUTPUT}"
[ -s "${OUTPUT}" ] && break
echo "Failed to receive eve-info tarball, retrying..."
done
Expand All @@ -55,4 +55,4 @@ if [ ! -s "${OUTPUT}" ]; then
fi

FILESIZE="$(stat -c%s "$OUTPUT")"
echo "Received ${OUTPUT} with size ${FILESIZE}"
echo "Received ${OUTPUT} with size ${FILESIZE}"

0 comments on commit c367052

Please sign in to comment.