Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to 4.11.0 #1905

Merged
merged 8 commits into from
Aug 1, 2023
Merged

Bump to 4.11.0 #1905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
434a399
Update Dockerfile - bump to 4.11.0
luisfcorreia Jul 31, 2023
20d2cf2
Merge branch 'trunk' into patch-13
diemol Aug 1, 2023
cf50e9c
Bump Selenium version
diemol Aug 1, 2023
019837d
Update Dockerfile
diemol Aug 1, 2023
40647f4
Bumping docker version
diemol Aug 1, 2023
90d4cb1
Retry
diemol Aug 1, 2023
7439b9a
Error when launching Python Docker
diemol Aug 1, 2023
7653fd6
Merge branch 'trunk' into patch-13
diemol Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ COPY supervisord.conf /etc
RUN mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
&& touch /opt/selenium/config.toml \
&& chmod -R 777 /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor /etc/passwd \
&& wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10.0/selenium-server-4.10.0.jar \
&& wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.11.0/selenium-server-4.11.0.jar \
-O /opt/selenium/selenium-server.jar \
&& wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.10.0/selenium-http-jdk-client-4.10.0.jar \
&& wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.11.0/selenium-http-jdk-client-4.11.0.jar \
-O /opt/selenium/selenium-http-jdk-client.jar \
&& chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
&& chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
Expand All @@ -89,7 +89,7 @@ RUN curl -fLo /tmp/cs https://github.com/coursier/launchers/raw/master/coursier
&& mkdir -p /external_jars \
&& chmod -R 775 /external_jars

RUN /tmp/cs fetch --classpath --cache /external_jars io.opentelemetry:opentelemetry-exporter-jaeger:1.22.0 io.grpc:grpc-netty:1.52.1 > /external_jars/.classpath.txt
RUN /tmp/cs fetch --classpath --cache /external_jars io.opentelemetry:opentelemetry-exporter-jaeger:1.26.0 io.grpc:grpc-netty:1.55.1 > /external_jars/.classpath.txt

RUN chmod 664 /external_jars/.classpath.txt

Expand Down
4 changes: 2 additions & 2 deletions tests/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if [ "${CI:-false}" = "false" ]; then
source docker-selenium-tests/bin/activate
fi

python -m pip install selenium==4.8.3 \
docker===4.2.0 \
python -m pip install selenium==4.11.2 \
docker===6.1.3 \
| grep -v 'Requirement already satisfied'

python test.py $1
Expand Down
6 changes: 3 additions & 3 deletions tests/docker-compose-v3-test-video.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version: "3"
services:
browser:
image: selenium/node-${BROWSER}:${TAG:-test-video}
image: selenium/node-${BROWSER}:${TAG}
shm_size: 2gb
depends_on:
- selenium-hub
Expand All @@ -16,7 +16,7 @@ services:
- "6900:5900"

browser_video:
image: selenium/video:${VIDEO_TAG:-test-video}
image: selenium/video:${VIDEO_TAG}
volumes:
- ./videos:/videos
depends_on:
Expand All @@ -26,7 +26,7 @@ services:
- FILE_NAME=${VIDEO_FILE_NAME}

selenium-hub:
image: selenium/hub:${TAG:-test-video}
image: selenium/hub:${TAG}
container_name: selenium-hub
ports:
- "4442:4442"
Expand Down
8 changes: 5 additions & 3 deletions tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
logger = logging.getLogger(__name__)

# Docker Client
client = docker.from_env()

NAMESPACE = os.environ.get('NAMESPACE')
VERSION = os.environ.get('VERSION')
USE_RANDOM_USER_ID = os.environ.get('USE_RANDOM_USER_ID')
Expand All @@ -24,6 +21,11 @@
no_proxy = os.environ.get('no_proxy', '')
SKIP_BUILD = os.environ.get('SKIP_BUILD', False)

try:
client = docker.from_env()
except:
client = None

IMAGE_NAME_MAP = {
# Hub
'Hub': 'hub',
Expand Down