You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2018/04/03 18:47:19 UTC
archiva git commit: Adding additional output for docker script
Repository: archiva
Updated Branches:
refs/heads/master a2febcecd -> ff44bab79
Adding additional output for docker script
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/ff44bab7
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/ff44bab7
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/ff44bab7
Branch: refs/heads/master
Commit: ff44bab792386b02b372fd6612d6c95a1a74cac8
Parents: a2febce
Author: Martin Stockhammer <ma...@apache.org>
Authored: Tue Apr 3 20:33:49 2018 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Tue Apr 3 20:46:56 2018 +0200
----------------------------------------------------------------------
src/ci/scripts/container_webtest.sh | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/ff44bab7/src/ci/scripts/container_webtest.sh
----------------------------------------------------------------------
diff --git a/src/ci/scripts/container_webtest.sh b/src/ci/scripts/container_webtest.sh
old mode 100644
new mode 100755
index b808455..90dbc45
--- a/src/ci/scripts/container_webtest.sh
+++ b/src/ci/scripts/container_webtest.sh
@@ -61,6 +61,7 @@ function stop_instance() {
function start_instance() {
echo "Starting container ${INSTANCE_NAME}"
+ echo "ARGS: -d -e SCREEN_WIDTH=${SCREEN_WIDTH} -e SCREEN_HEIGHT=${SCREEN_HEIGHT} --net=${NETWORK_TYPE} -p ${PORT_MAPPING} --name ${INSTANCE_NAME} ${TAG}"
docker run -d -e "SCREEN_WIDTH=${SCREEN_WIDTH}" -e "SCREEN_HEIGHT=${SCREEN_HEIGHT}" --net="${NETWORK_TYPE}" -p "${PORT_MAPPING}" --name "${INSTANCE_NAME}" "${TAG}"
}
@@ -90,7 +91,21 @@ if [ "${START_ARG}" == "start" ]; then
stop_instance
# Starting
start_instance
+ if [ $? -ne 0 ]; then
+ echo "Error from docker run"
+ fi
+ docker ps
+ TIMEOUT=20
+ RES=1
+ while [ $RES -gt 0 -a $TIMEOUT -gt 0 ]; do
+ sleep 0.2
+ TIMEOUT=$((TIMEOUT-1))
+ docker logs "${INSTANCE_NAME}" | tail -5 | grep -q "Selenium Server is up and running"
+ RES=$?
+ done
+ docker logs "${INSTANCE_NAME}"
elif [ "${START_ARG}" == "stop" ]; then
+ docker logs "${INSTANCE_NAME}"
stop_instance
else
print_usage