Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit d390348

Browse files
committed
CI: Re-use the built docker image between stages
1 parent 81287b9 commit d390348

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

bin/cleanup-container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ killall --ignore-case --quiet --regexp "firefox.*"
99

1010
# After transferring the logs: reset them for the next test
1111
for filename in /var/log/cont/*.log; do
12-
truncate -s 0 $filename
12+
truncate -s 0 ${filename} || echo "WARN: Failed to truncate ${filename}"
1313
done

xterm/bin/start-xterm.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ if [ "${VIDEO}" = "true" ]; then
7979
start-video &
8080
fi
8181

82-
# TODO: Re enable shutdown at some point. But fails when
83-
# we have little ports available (corner case but fails)
84-
# if ! timeout --foreground ${WAIT_TIMEOUT} wait-vnc.sh; then
85-
# bash -c "grep -v webSocketsHandshake ${VNC_TRYOUT_ERR_LOG}*.log" 1>&2
86-
# shutdown "Failed while waiting for VNC to start!"
87-
# fi
88-
8982
# Help at http://supervisord.org/subprocess.html#process-states
9083
echo "Checking process-states through supervisorctl status"
9184
if ! supervisorctl -c /etc/supervisor/supervisord.conf \

xterm/bin/wait_all_done

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ else
3939
bash -c 'ls -la /var/log/cont/*' || true
4040
echo "" && echo "" && echo "==> errors <=="
4141
bash -c 'errors' || true
42-
# bash -c "grep -v webSocketsHandshake /var/log/cont/vnc-tryouts-stderr*.log"
4342

4443
die "
4544
Your docker-selenium didn't start properly.

0 commit comments

Comments
 (0)