Skip to content

Commit 505858f

Browse files
committed
start selenium-server-standalone hub in pipeline...
1 parent f4eb53e commit 505858f

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

Dockerfiles/Dockerfile.selenium-jenkins-python311-chromium

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ USER root
88
# on CI node, django db defaults to sqlite3
99
RUN sudo apt-get update ; apt-get install -yq git build-essential zlib1g-dev make libssl-dev libffi-dev libsqlite3-dev sqlite3
1010
RUN wget -O /Python-3.11.9.tgz https://www.python.org/ftp/python/3.11.9/Python-3.11.9.tgz
11+
RUN wget -O /selenium-server-standalone.jar https://selenium-release.storage.googleapis.com/3.5/selenium-server-standalone-3.5.3.jar
1112
WORKDIR /
1213
RUN tar -xvzf Python-3.11.9.tgz
1314
WORKDIR /Python-3.11.9

Jenkinsfiles/Jenkinsfile.cbc-run-multi-pr-checks-w-selenium-chromium

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ pipeline {
7575
}
7676
}
7777

78-
stage("CHECK selenium hub and java") {
78+
stage("Start selenium server jar in background") {
7979
steps{
8080
sh """
81-
java -jar selenium-server-standalone.jar -role hub
81+
java -jar selenium-server-standalone.jar -role hub -host chrome &
8282
"""
8383
}
8484
}
@@ -109,7 +109,7 @@ pipeline {
109109
}
110110
steps{
111111
sh """
112-
USE_NEW_PERM_SCREEN=true pytest -s ./apps/integration_tests/logging_tests.py::TestLoggings::test_auth_fhir_flows_logging
112+
USE_NEW_PERM_SCREEN=true SELENIUM_GRID=true pytest -s ./apps/integration_tests/logging_tests.py::TestLoggings::test_auth_fhir_flows_logging
113113
"""
114114
}
115115
}
@@ -121,7 +121,7 @@ pipeline {
121121
steps{
122122
sh 'echo "RUN selenium tests - user account and app management tests"'
123123
sh """
124-
USE_NEW_PERM_SCREEN=true pytest -s ./apps/integration_tests/selenium_accounts_tests.py::TestUserAndAppMgmt::testAccountAndAppMgmt
124+
USE_NEW_PERM_SCREEN=true SELENIUM_GRID=true pytest -s ./apps/integration_tests/selenium_accounts_tests.py::TestUserAndAppMgmt::testAccountAndAppMgmt
125125
"""
126126
}
127127
}
@@ -141,7 +141,7 @@ pipeline {
141141
steps{
142142
sh 'echo "RUN selenium tests - testclient based authorization flow tests and data flow tests"'
143143
sh """
144-
USE_NEW_PERM_SCREEN=true pytest -s ./apps/integration_tests/selenium_tests.py
144+
USE_NEW_PERM_SCREEN=true SELENIUM_GRID=true pytest -s ./apps/integration_tests/selenium_tests.py
145145
"""
146146
}
147147
}

docker-compose.selenium.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ services:
1313
depends_on:
1414
bb2slsx:
1515
condition: service_healthy
16-
# chrome:
17-
# condition: service_started
16+
chrome:
17+
condition: service_started
1818

19-
# chrome:
20-
# image: seleniarm/standalone-chromium
21-
# hostname: chrome
22-
# ports:
23-
# - "4444:4444"
24-
# - "5900:5900"
19+
chrome:
20+
image: seleniarm/standalone-chromium
21+
hostname: chrome
22+
ports:
23+
- "4444:4444"
24+
- "5900:5900"
2525

2626
msls:
2727
build: ./dev-local

docker-compose/run_selenium_tests_local.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ PYTEST_SHOW_TRACE_OPT=''
8787
set_slsx
8888

8989
# Parse command line option
90-
while getopts "hplt" option; do
90+
while getopts "hpgt" option; do
9191
case $option in
9292
h)
9393
display_usage

docker-compose/run_selenium_tests_remote.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export SELENIUM_GRID=false
6161
# Show test actions on std out : pytest -s
6262
PYTEST_SHOW_TRACE_OPT=''
6363

64-
while getopts "hplt" option; do
64+
while getopts "hpgt" option; do
6565
case $option in
6666
h)
6767
display_usage;

0 commit comments

Comments
 (0)