Skip to content

Commit

Permalink
[ci] Update test matrix with python versions
Browse files Browse the repository at this point in the history
Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
  • Loading branch information
VietND96 committed Nov 19, 2024
1 parent b30937e commit 6dc901e
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ workflows:
k8s-version: 'v1.31.2'
test-strategy: deployment_https
cluster: 'minikube'
helm-version: 'v3.16.1'
docker-version: '27.2.0'
helm-version: 'v3.16.3'
docker-version: '27.3.1'
test-upgrade: true
- docker-test:
name: "Docker test - Use random user (true)"
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/helm-chart-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,48 +39,55 @@ jobs:
cluster: 'minikube'
helm-version: 'v3.11.3'
docker-version: '24.0.9'
python-version: '3.8'
test-upgrade: true
service-mesh: true
- k8s-version: 'v1.26.15'
test-strategy: disabled
cluster: 'minikube'
helm-version: 'v3.11.3'
docker-version: '24.0.9'
python-version: '3.8'
test-upgrade: true
service-mesh: false
- k8s-version: 'v1.27.16'
test-strategy: job
cluster: 'minikube'
helm-version: 'v3.12.3'
docker-version: '24.0.9'
python-version: '3.9'
test-upgrade: true
service-mesh: true
- k8s-version: 'v1.28.15'
test-strategy: deployment
cluster: 'minikube'
helm-version: 'v3.13.3'
docker-version: '24.0.9'
python-version: '3.10'
test-upgrade: true
service-mesh: true
- k8s-version: 'v1.29.10'
test-strategy: job_https
cluster: 'minikube'
helm-version: 'v3.14.3'
docker-version: '25.0.5'
python-version: '3.11'
test-upgrade: true
service-mesh: false
- k8s-version: 'v1.30.6'
test-strategy: job_hostname
cluster: 'minikube'
helm-version: 'v3.15.4'
docker-version: '26.1.4'
python-version: '3.12'
test-upgrade: true
service-mesh: false
- k8s-version: 'v1.31.2'
test-strategy: deployment_https
cluster: 'minikube'
helm-version: 'v3.16.1'
docker-version: '27.2.0'
helm-version: 'v3.16.3'
docker-version: '27.3.1'
python-version: '3.13'
test-upgrade: true
service-mesh: false
env:
Expand Down Expand Up @@ -111,7 +118,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@main
with:
python-version: '3.11'
python-version: ${{ matrix.python-version }}
check-latest: true
- name: Verify chart configuration up-to-date
run: make lint_readme_charts
Expand Down
2 changes: 1 addition & 1 deletion Base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG RELEASE=selenium-${VERSION}
# Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/MODULE.bazel)
ARG OPENTELEMETRY_VERSION=1.43.0
ARG GRPC_VERSION=1.68.0
ARG NETTY_VERSION=4.1.114.Final
ARG NETTY_VERSION=4.1.115.Final
ARG CS_VERSION=2.1.13

#Arguments to define the user running Selenium
Expand Down
2 changes: 1 addition & 1 deletion tests/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [ "${CI:-false}" = "false" ]; then
fi

if [[ "${BASE_VERSION}" == *-SNAPSHOT ]]; then
latest_version="$(curl -s https://test.pypi.org/pypi/selenium/json | jq -r '.releases | keys | .[]' | sort -V | tail -n 1)"
latest_version="$(curl -s https://test.pypi.org/pypi/selenium/json | jq -r '.releases | to_entries | sort_by(.value[0].upload_time) | .[-1].key')"
python3 -m pip install --index-url https://test.pypi.org/simple/ selenium==${latest_version} --extra-index-url https://pypi.org/simple/ --upgrade --force-reinstall --break-system-packages | grep -v 'Requirement already satisfied'
else
python3 -m pip install selenium==${BINDING_VERSION} | grep -v 'Requirement already satisfied'
Expand Down
4 changes: 4 additions & 0 deletions tests/docker-compose-v3-test-parallel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ services:
volumes:
- ./videos/certs:/opt/selenium/secrets
environment:
- SE_ENABLE_TRACING=false
- SE_EVENT_BUS_HOST=selenium-hub
- SE_EVENT_BUS_PUBLISH_PORT=4442
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
Expand Down Expand Up @@ -57,6 +58,7 @@ services:
volumes:
- ./videos/certs:/opt/selenium/secrets
environment:
- SE_ENABLE_TRACING=false
- SE_EVENT_BUS_HOST=selenium-hub
- SE_EVENT_BUS_PUBLISH_PORT=4442
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
Expand Down Expand Up @@ -94,6 +96,7 @@ services:
volumes:
- ./videos/certs:/opt/selenium/secrets
environment:
- SE_ENABLE_TRACING=false
- SE_EVENT_BUS_HOST=selenium-hub
- SE_EVENT_BUS_PUBLISH_PORT=4442
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
Expand Down Expand Up @@ -128,6 +131,7 @@ services:
volumes:
- ./videos/certs:/opt/selenium/secrets
environment:
- SE_ENABLE_TRACING=false
- SE_LOG_LEVEL=${LOG_LEVEL}
- SE_SESSION_REQUEST_TIMEOUT=${REQUEST_TIMEOUT}
- SE_SUPERVISORD_LOG_LEVEL=error
Expand Down
1 change: 1 addition & 0 deletions tests/docker-compose-v3-test-standalone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ services:
depends_on:
- browser_video
environment:
- SE_ENABLE_TRACING=false
- SE_NODE_MAX_SESSIONS=1
- SE_NODE_OVERRIDE_MAX_SESSIONS=true
- SE_NODE_ENABLE_MANAGED_DOWNLOADS=${SELENIUM_ENABLE_MANAGED_DOWNLOADS}
Expand Down
3 changes: 3 additions & 0 deletions tests/docker-compose-v3-test-video.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
- selenium-hub
- browser_video
environment:
- SE_ENABLE_TRACING=false
- SE_EVENT_BUS_HOST=selenium-hub
- SE_EVENT_BUS_PUBLISH_PORT=4442
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
Expand Down Expand Up @@ -59,6 +60,8 @@ services:
- "4442:4442"
- "4443:4443"
- "4444:4444"
environment:
- SE_ENABLE_TRACING=false
healthcheck:
test: "/opt/bin/check-grid.sh --host 0.0.0.0 --port 4444"
interval: 15s
Expand Down

0 comments on commit 6dc901e

Please sign in to comment.