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

Commit 36b476a

Browse files
elgaludiemol
authored andcommitted
Upgrade Firefox patch level to 63.0.3 (#286)
* Upgrade Firefox patch level to 63.0.3 * Default SELENIUM_NODE_HOST=0.0.0.0 * Fallback to dosel/zalenium:3.14.0g * Add new test stage Zalenium_Prev
1 parent 552d53e commit 36b476a

File tree

7 files changed

+23
-11
lines changed

7 files changed

+23
-11
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,13 @@ jobs:
5959
- travis_retry ./test/before_install_pull
6060
- travis_retry ./test/script_scenario_compose_N_N
6161

62-
- env: test=Zalenium
62+
- env: test=Zalenium_Prev
63+
script:
64+
- gem install bitballoon || true
65+
- travis_retry ./test/before_install_pull
66+
- travis_retry ./test/script_scenario_zalenium "3.14.0g"
67+
68+
- env: test=Zalenium_Latest
6369
script:
6470
- gem install bitballoon || true
6571
- travis_retry ./test/before_install_pull

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ RUN apt -qqy update \
551551
# Please use https://github.com/zalando/zalenium
552552

553553
#-----------------#
554-
# Mozilla
554+
# Mozilla
555555
#
556556
#-----------------#
557557
# Install all Firefox dependencies
@@ -601,7 +601,7 @@ ENV FF_LANG="en-US" \
601601

602602
#--- For Selenium 3
603603
# Layer size: big: 108.2 MB
604-
ARG FF_VER="63.0.1"
604+
ARG FF_VER="63.0.3"
605605

606606
ENV FF_COMP="firefox-${FF_VER}.tar.bz2"
607607
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}" \
879879
SELENIUM_HUB_PORT="${DEFAULT_SELENIUM_HUB_PORT}" \
880880
SELENIUM_HUB_PROTO="http" \
881881
SELENIUM_HUB_HOST="127.0.0.1" \
882-
SELENIUM_NODE_HOST="127.0.0.1" \
882+
# Unfortunately selenium is missing a -bind setting so -host
883+
# is used multipurpose forcing us to set it now to 0.0.0.0
884+
# to match the binding meaning in oposed to host meaning
885+
SELENIUM_NODE_HOST="0.0.0.0" \
883886
SELENIUM_NODE_CH_PORT="${DEFAULT_SELENIUM_NODE_CH_PORT}" \
884887
SELENIUM_NODE_FF_PORT="${DEFAULT_SELENIUM_NODE_FF_PORT}" \
885888
SELENIUM_MULTINODE_PORT="${DEFAULT_SELENIUM_MULTINODE_PORT}" \

bin/entry.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ if [ "${ZALENIUM}" == "true" ] && [ "${CONTAINER_IP}" == "" ]; then
154154
break
155155
fi
156156
echo -n '.'
157-
sleep 2
157+
sleep 1
158158
done
159159
fi
160160

selenium-multinode/bin/start-selenium-multinode.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ java \
5252
${JAVA_OPTS} \
5353
-jar ${SELENIUM_JAR_PATH} \
5454
-port ${SELENIUM_MULTINODE_PORT} \
55-
-host ${SELENIUM_NODE_HOST} \
55+
-host "${SELENIUM_NODE_HOST}" \
5656
-role node \
5757
-hub "${SELENIUM_HUB_PROTO}://${SELENIUM_HUB_HOST}:${SELENIUM_HUB_PORT}/grid/register" \
5858
-browser "${CHROME_BROWSER_CAPS}" \

selenium-node-chrome/bin/start-selenium-node-chrome.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ java \
4444
${JAVA_OPTS} \
4545
-jar ${SELENIUM_JAR_PATH} \
4646
-port ${SELENIUM_NODE_CH_PORT} \
47-
-host ${SELENIUM_NODE_HOST} \
47+
-host "${SELENIUM_NODE_HOST}" \
4848
-role node \
4949
-hub "${SELENIUM_HUB_PROTO}://${SELENIUM_HUB_HOST}:${SELENIUM_HUB_PORT}/grid/register" \
5050
-browser "${CHROME_BROWSER_CAPS}" \

selenium-node-firefox/bin/start-selenium-node-firefox.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ java \
4747
${JAVA_OPTS} \
4848
-jar ${SELENIUM_JAR_PATH} \
4949
-port ${SELENIUM_NODE_FF_PORT} \
50-
-host ${SELENIUM_NODE_HOST} \
50+
-host "${SELENIUM_NODE_HOST}" \
5151
-role node \
5252
-hub "${SELENIUM_HUB_PROTO}://${SELENIUM_HUB_HOST}:${SELENIUM_HUB_PORT}/grid/register" \
5353
-browser "${FIREFOX_BROWSER_CAPS}" \

test/script_scenario_zalenium

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,19 @@ function stop_zalenium() {
3131
stop_zalenium
3232
rm -rf $(pwd)/tmp_videos || true
3333

34+
# Can take Zalenium docker tag as first argument
35+
_zalenium_tag=${1-latest}
36+
3437
# Dependencies
3538
pip install --upgrade -r test/requirements.txt
36-
docker pull dosel/zalenium
39+
docker pull dosel/zalenium:${_zalenium_tag}
40+
docker tag dosel/zalenium:${_zalenium_tag} dosel/zalenium:latest
3741

3842
# Use Zalenium one-liner but don't pull
3943
# TODO: --maxTestSessions 5
4044
curl -sSL https://raw.githubusercontent.com/dosel/t/i/p | \
4145
PULL_DEPENDENCIES=false bash -s \
42-
start --firefoxContainers 0 \
43-
--chromeContainers 0 \
46+
start --desiredContainers 0 \
4447
--videos-dir $(pwd)/tmp_videos
4548

4649
set +x

0 commit comments

Comments
 (0)