diff --git a/.travis.yml b/.travis.yml index 1a481666..d79225c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,13 @@ jobs: - travis_retry ./test/before_install_pull - travis_retry ./test/script_scenario_compose_N_N - - env: test=Zalenium + - env: test=Zalenium_Prev + script: + - gem install bitballoon || true + - travis_retry ./test/before_install_pull + - travis_retry ./test/script_scenario_zalenium "3.14.0g" + + - env: test=Zalenium_Latest script: - gem install bitballoon || true - travis_retry ./test/before_install_pull diff --git a/Dockerfile b/Dockerfile index f0a3d770..4a7d18dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -551,7 +551,7 @@ RUN apt -qqy update \ # Please use https://github.com/zalando/zalenium #-----------------# -# Mozilla +# Mozilla # #-----------------# # Install all Firefox dependencies @@ -601,7 +601,7 @@ ENV FF_LANG="en-US" \ #--- For Selenium 3 # Layer size: big: 108.2 MB -ARG FF_VER="63.0.1" +ARG FF_VER="63.0.3" ENV FF_COMP="firefox-${FF_VER}.tar.bz2" ENV FF_URL="${FF_BASE_URL}/${FF_INNER_PATH}/${FF_VER}/${FF_PLATFORM}/${FF_LANG}/${FF_COMP}" @@ -879,7 +879,10 @@ ENV FIREFOX_VERSION="${FF_VER}" \ SELENIUM_HUB_PORT="${DEFAULT_SELENIUM_HUB_PORT}" \ SELENIUM_HUB_PROTO="http" \ SELENIUM_HUB_HOST="127.0.0.1" \ - SELENIUM_NODE_HOST="127.0.0.1" \ + # Unfortunately selenium is missing a -bind setting so -host + # is used multipurpose forcing us to set it now to 0.0.0.0 + # to match the binding meaning in oposed to host meaning + SELENIUM_NODE_HOST="0.0.0.0" \ SELENIUM_NODE_CH_PORT="${DEFAULT_SELENIUM_NODE_CH_PORT}" \ SELENIUM_NODE_FF_PORT="${DEFAULT_SELENIUM_NODE_FF_PORT}" \ SELENIUM_MULTINODE_PORT="${DEFAULT_SELENIUM_MULTINODE_PORT}" \ diff --git a/bin/entry.sh b/bin/entry.sh index 3225c9d9..3b24c110 100755 --- a/bin/entry.sh +++ b/bin/entry.sh @@ -154,7 +154,7 @@ if [ "${ZALENIUM}" == "true" ] && [ "${CONTAINER_IP}" == "" ]; then break fi echo -n '.' - sleep 2 + sleep 1 done fi diff --git a/selenium-multinode/bin/start-selenium-multinode.sh b/selenium-multinode/bin/start-selenium-multinode.sh index 14542572..492ea415 100755 --- a/selenium-multinode/bin/start-selenium-multinode.sh +++ b/selenium-multinode/bin/start-selenium-multinode.sh @@ -52,7 +52,7 @@ java \ ${JAVA_OPTS} \ -jar ${SELENIUM_JAR_PATH} \ -port ${SELENIUM_MULTINODE_PORT} \ - -host ${SELENIUM_NODE_HOST} \ + -host "${SELENIUM_NODE_HOST}" \ -role node \ -hub "${SELENIUM_HUB_PROTO}://${SELENIUM_HUB_HOST}:${SELENIUM_HUB_PORT}/grid/register" \ -browser "${CHROME_BROWSER_CAPS}" \ diff --git a/selenium-node-chrome/bin/start-selenium-node-chrome.sh b/selenium-node-chrome/bin/start-selenium-node-chrome.sh index b8ff2d05..1e844c88 100755 --- a/selenium-node-chrome/bin/start-selenium-node-chrome.sh +++ b/selenium-node-chrome/bin/start-selenium-node-chrome.sh @@ -44,7 +44,7 @@ java \ ${JAVA_OPTS} \ -jar ${SELENIUM_JAR_PATH} \ -port ${SELENIUM_NODE_CH_PORT} \ - -host ${SELENIUM_NODE_HOST} \ + -host "${SELENIUM_NODE_HOST}" \ -role node \ -hub "${SELENIUM_HUB_PROTO}://${SELENIUM_HUB_HOST}:${SELENIUM_HUB_PORT}/grid/register" \ -browser "${CHROME_BROWSER_CAPS}" \ diff --git a/selenium-node-firefox/bin/start-selenium-node-firefox.sh b/selenium-node-firefox/bin/start-selenium-node-firefox.sh index 35729bdb..be7e5e68 100755 --- a/selenium-node-firefox/bin/start-selenium-node-firefox.sh +++ b/selenium-node-firefox/bin/start-selenium-node-firefox.sh @@ -47,7 +47,7 @@ java \ ${JAVA_OPTS} \ -jar ${SELENIUM_JAR_PATH} \ -port ${SELENIUM_NODE_FF_PORT} \ - -host ${SELENIUM_NODE_HOST} \ + -host "${SELENIUM_NODE_HOST}" \ -role node \ -hub "${SELENIUM_HUB_PROTO}://${SELENIUM_HUB_HOST}:${SELENIUM_HUB_PORT}/grid/register" \ -browser "${FIREFOX_BROWSER_CAPS}" \ diff --git a/test/script_scenario_zalenium b/test/script_scenario_zalenium index 70ab243c..23aaeb42 100755 --- a/test/script_scenario_zalenium +++ b/test/script_scenario_zalenium @@ -31,16 +31,19 @@ function stop_zalenium() { stop_zalenium rm -rf $(pwd)/tmp_videos || true +# Can take Zalenium docker tag as first argument +_zalenium_tag=${1-latest} + # Dependencies pip install --upgrade -r test/requirements.txt -docker pull dosel/zalenium +docker pull dosel/zalenium:${_zalenium_tag} +docker tag dosel/zalenium:${_zalenium_tag} dosel/zalenium:latest # Use Zalenium one-liner but don't pull # TODO: --maxTestSessions 5 curl -sSL https://raw.githubusercontent.com/dosel/t/i/p | \ PULL_DEPENDENCIES=false bash -s \ - start --firefoxContainers 0 \ - --chromeContainers 0 \ + start --desiredContainers 0 \ --videos-dir $(pwd)/tmp_videos set +x