Merge branch 'trunk' into extra-libs

Author: Trigtrig

.github/actions/get-latest-upstream/action.yml

@@ -25,7 +25,7 @@ runs:
           RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[] | select(.prerelease == false)] | .[0].tag_name')
         else
           echo "Getting the latest Nightly release."
-          RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[] | select(.prerelease == true)] | .[0].tag_name')
+          RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[] | select(.prerelease == true)] | .[0].tag_name' || echo "")
           if [ -z "${RELEASE}" ]; then
             echo "Nightly release not found, getting the latest stable release."
             RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[] | select(.prerelease == false)] | .[0].tag_name')

.github/workflows/docker-test.yml

@@ -252,7 +252,7 @@ jobs:
         if: contains(matrix.os, 'arm') == false
         uses: nick-invision/retry@master
         with:
-          timeout_minutes: 40
+          timeout_minutes: 90
           max_attempts: 2
           retry_wait_seconds: 60
           command: |
@@ -261,7 +261,7 @@ jobs:
         if: contains(matrix.os, 'arm') == true
         uses: nick-invision/retry@master
         with:
-          timeout_minutes: 40
+          timeout_minutes: 90
           max_attempts: 2
           retry_wait_seconds: 60
           command: |

.github/workflows/helm-chart-test.yml

@@ -263,7 +263,7 @@ jobs:
       - name: Test chart upgrade
         if: (matrix.test-upgrade == true)
         run: |
-          NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} SET_MAX_REPLICAS=10 TEST_NAME_OVERRIDE=true TEST_UPGRADE_CHART=${TEST_UPGRADE_CHART} make chart_test_autoscaling_${{ matrix.test-strategy }}
+          NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} SET_MAX_REPLICAS=10 TEST_NAME_OVERRIDE=true TEST_UPGRADE_CHART=${TEST_UPGRADE_CHART} SET_UPDATE_STRATEGY=Recreate make chart_test_autoscaling_${{ matrix.test-strategy }}
       - name: Cleanup Kubernetes cluster
         if: always()
         run: CLUSTER=${CLUSTER} make chart_cluster_cleanup

ENV_VARIABLES.md

@@ -102,7 +102,7 @@
 | SE_DISTRIBUTOR_HOST |  |  |  |
 | SE_DISTRIBUTOR_PORT | 5553 |  |  |
 | SE_GRID_URL |  |  | --grid-url |
-| SE_NODE_DOCKER_CONFIG_FILENAME |  |  |  |
+| SE_NODE_DOCKER_CONFIG_FILENAME | docker.toml |  |  |
 | SE_NODE_GRACEFUL_SHUTDOWN |  |  |  |
 | SE_VIDEO_CONTAINER_NAME |  |  |  |
 | SE_RECORD_VIDEO | true |  |  |

Makefile

@@ -951,7 +951,7 @@ chart_render_template:
 	RENDER_HELM_TEMPLATE_ONLY=true NAMESPACE=$(NAME) KEDA_TAG_VERSION=$(KEDA_TAG_VERSION) BUILD_DATE=$(BUILD_DATE) make chart_test_autoscaling_disabled chart_test_autoscaling_deployment_https chart_test_autoscaling_deployment chart_test_autoscaling_job_https chart_test_autoscaling_job_hostname chart_test_autoscaling_job chart_test_autoscaling_playwright_connect_grid
 
 chart_test_autoscaling_disabled:
-	PLATFORMS=$(PLATFORMS) TEST_CHROMIUM=true RELEASE_NAME=selenium SELENIUM_GRID_AUTOSCALING=false CHART_ENABLE_TRACING=true TEST_PATCHED_KEDA=$(TEST_PATCHED_KEDA) TEST_CUSTOM_SPECIFIC_NAME=true \
+	PLATFORMS=$(PLATFORMS) TEST_CHROMIUM=true RELEASE_NAME=selenium SELENIUM_GRID_AUTOSCALING=false CHART_ENABLE_TRACING=true TEST_PATCHED_KEDA=$(TEST_PATCHED_KEDA) TEST_CUSTOM_SPECIFIC_NAME=true SELENIUM_GRID_MONITORING=false \
 	SECURE_INGRESS_ONLY_GENERATE=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -I | cut -d' ' -f1) SELENIUM_GRID_PORT=443 EXTERNAL_UPLOADER_CONFIG=true \
 	VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) KEDA_BASED_NAME=$(KEDA_BASED_NAME) KEDA_BASED_TAG=$(KEDA_BASED_TAG) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) BASE_VERSION=$(BASE_VERSION) \
 	TEMPLATE_OUTPUT_FILENAME="k8s_nodeChromium_enableTracing_secureIngress_generateCerts_ingressPublicIP_subPath.yaml" \

NodeDocker/Dockerfile

@@ -25,10 +25,11 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-docker.sh \
     start-socat.sh \
     /opt/bin/
 
-COPY --chown="${SEL_UID}:${SEL_GID}" config.toml /opt/selenium/
+COPY --chown="${SEL_UID}:${SEL_GID}" config.toml /opt/selenium/docker.toml
 
 COPY selenium-grid-docker.conf /etc/supervisor/conf.d/
 
 ENV SE_OTEL_SERVICE_NAME="selenium-node-docker" \
     SE_EVENT_BUS_PUBLISH_PORT="4442" \
-    SE_EVENT_BUS_SUBSCRIBE_PORT="4443"
+    SE_EVENT_BUS_SUBSCRIBE_PORT="4443" \
+    SE_NODE_DOCKER_CONFIG_FILENAME="docker.toml"

NodeDocker/config.toml

@@ -6,6 +6,8 @@ configs = [
     "selenium/standalone-chrome:4.30.0-20250323", '{"browserName": "chrome", "platformName": "linux"}',
     "selenium/standalone-edge:4.30.0-20250323", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
     ]
+# Share configs of volumes, DNS, extra hosts between node-docker and node browser containers
+host-config-keys = ["Dns", "DnsOptions", "DnsSearch", "ExtraHosts", "Binds"]
 
 # URL for connecting to the docker daemon
 # host.docker.internal works for macOS and Windows.

README.md

@@ -753,6 +753,9 @@ video-image = "selenium/video:ffmpeg-7.1.1.1-20250323"
 #port = <port-from-node-machine>
 ```
 
+**Mount the local `config.toml` file to the container path `/opt/selenium/docker.toml`**.
+This config file path specific for Dynamic Grid (node/standalone docker) by default to avoid conflict with the config file in node browser containers (since users can share volumes config to node browser containers, see below section for details).
+
 With the optional config key `host-config-keys` under section [docker] in a config.toml file (or CLI option --docker-host-config-keys). Users can specify a list of docker host configuration keys that should be passed to browser containers.
 
 Valid key names for Docker host config can be found in the Docker API [documentation](https://docs.docker.com/engine/api/latest/#tag/Container/operation/ContainerCreate) or via the command `docker inspect` the node-docker container.
@@ -799,7 +802,7 @@ virtual machines.
 $ docker network create grid
 $ docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.30.0-20250323
 $ docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \
-    -v ${PWD}/config.toml:/opt/selenium/config.toml \
+    -v ${PWD}/config.toml:/opt/selenium/docker.toml \
     -v ${PWD}/assets:/opt/selenium/assets \
     -v /var/run/docker.sock:/var/run/docker.sock \
     selenium/node-docker:4.30.0-20250323
@@ -811,7 +814,7 @@ $ docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \
 $ docker network create grid
 $ docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.30.0-20250323
 $ docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub `
-    -v ${PWD}/config.toml:/opt/selenium/config.toml `
+    -v ${PWD}/config.toml:/opt/selenium/docker.toml `
     -v ${PWD}/assets:/opt/selenium/assets `
     -v /var/run/docker.sock:/var/run/docker.sock `
     selenium/node-docker:4.30.0-20250323
@@ -832,7 +835,7 @@ $ docker network rm grid
 
 ```bash
 docker run --rm --name selenium-docker -p 4444:4444 \
-    -v ${PWD}/config.toml:/opt/selenium/config.toml \
+    -v ${PWD}/config.toml:/opt/selenium/docker.toml \
     -v ${PWD}/assets:/opt/selenium/assets \
     -v /var/run/docker.sock:/var/run/docker.sock \
     selenium/standalone-docker:4.30.0-20250323
@@ -842,7 +845,7 @@ docker run --rm --name selenium-docker -p 4444:4444 \
 
 ```bash
 docker run --rm --name selenium-docker -p 4444:4444 `
-    -v ${PWD}/config.toml:/opt/selenium/config.toml `
+    -v ${PWD}/config.toml:/opt/selenium/docker.toml `
     -v ${PWD}/assets:/opt/selenium/assets `
     -v /var/run/docker.sock:/var/run/docker.sock `
     selenium/standalone-docker:4.30.0-20250323
@@ -863,7 +866,7 @@ $ docker run -d -p 4442-4444:4442-4444 --name selenium-hub selenium/hub:4.30.0-2
 ```bash
 $ docker run -d -p 5555:5555 \
     -e SE_EVENT_BUS_HOST=<ip-from-machine-1> \
-    -v ${PWD}/config.toml:/opt/selenium/config.toml \
+    -v ${PWD}/config.toml:/opt/selenium/docker.toml \
     -v ${PWD}/assets:/opt/selenium/assets \
     -v /var/run/docker.sock:/var/run/docker.sock \
     selenium/node-docker:4.30.0-20250323
@@ -874,7 +877,7 @@ $ docker run -d -p 5555:5555 \
 ```bash
 $ docker run -d -p 5555:5555 `
     -e SE_EVENT_BUS_HOST=<ip-from-machine-1> `
-    -v ${PWD}/config.toml:/opt/selenium/config.toml `
+    -v ${PWD}/config.toml:/opt/selenium/docker.toml `
     -v ${PWD}/assets:/opt/selenium/assets `
     -v /var/run/docker.sock:/var/run/docker.sock `
     selenium/node-docker:4.30.0-20250323
@@ -932,7 +935,7 @@ be forwared and set in the container. You can set the desired environment variab
 ```bash
 docker run --rm --name selenium-docker -p 4444:4444 \
     -e SE_NODE_SESSION_TIMEOUT=700 \
-    -v ${PWD}/config.toml:/opt/selenium/config.toml \
+    -v ${PWD}/config.toml:/opt/selenium/docker.toml \
     -v ${PWD}/assets:/opt/selenium/assets \
     -v /var/run/docker.sock:/var/run/docker.sock \
     selenium/standalone-docker:4.30.0-20250323
@@ -943,7 +946,7 @@ docker run --rm --name selenium-docker -p 4444:4444 \
 ```bash
 docker run --rm --name selenium-docker -p 4444:4444 `
     -e SE_NODE_SESSION_TIMEOUT=700 `
-    -v ${PWD}/config.toml:/opt/selenium/config.toml `
+    -v ${PWD}/config.toml:/opt/selenium/docker.toml `
     -v ${PWD}/assets:/opt/selenium/assets `
     -v /var/run/docker.sock:/var/run/docker.sock `
     selenium/standalone-docker:4.30.0-20250323

StandaloneDocker/start-selenium-grid-docker.sh

@@ -94,6 +94,10 @@ if [ "${SE_ENABLE_TLS}" = "true" ]; then
   fi
 fi
 
+if [ ! -z "${SE_NODE_DOCKER_CONFIG_FILENAME}" ]; then
+  CONFIG_FILE="/opt/selenium/${SE_NODE_DOCKER_CONFIG_FILENAME}"
+fi
+
 echo "Selenium Grid Standalone Docker configuration: "
 cat "${CONFIG_FILE}"
 

Video/video.sh

@@ -145,14 +145,14 @@ function stop_recording() {
   stop_ffmpeg
   echo "$(date -u +"${ts_format}") [${process_name}] - Video recording stopped"
   recorded_count=$((recorded_count + 1))
+  recording_started="false"
   if [[ "${VIDEO_UPLOAD_ENABLED}" = "true" ]] && [[ -n "${UPLOAD_DESTINATION_PREFIX}" ]]; then
     upload_destination=${UPLOAD_DESTINATION_PREFIX}/${video_file_name}
     echo "$(date -u +"${ts_format}") [${process_name}] - Add to pipe a signal Uploading video to $upload_destination"
     echo "$video_file ${UPLOAD_DESTINATION_PREFIX}" >>${UPLOAD_PIPE_FILE} &
   elif [[ "${VIDEO_UPLOAD_ENABLED}" = "true" ]] && [[ -z "${UPLOAD_DESTINATION_PREFIX}" ]]; then
     echo "$(date -u +"${ts_format}") [${process_name}] - Upload destination not known since UPLOAD_DESTINATION_PREFIX is not set. Continue without uploading."
   fi
-  recording_started="false"
 }
 
 function check_if_ffmpeg_running() {
@@ -182,7 +182,6 @@ function wait_for_file_integrity() {
 function stop_if_recording_inprogress() {
   if [[ "$recording_started" = "true" ]] || check_if_ffmpeg_running; then
     stop_recording
-    wait_for_file_integrity
   fi
 }
 
@@ -223,7 +222,6 @@ if [[ "${VIDEO_UPLOAD_ENABLED}" != "true" ]] && [[ "${VIDEO_FILE_NAME}" != "auto
   if ps -p $FFMPEG_PID >/dev/null; then
     wait $FFMPEG_PID
   fi
-  wait_for_file_integrity
 
 else
   trap graceful_exit_force SIGTERM SIGINT EXIT
@@ -247,34 +245,32 @@ else
       video_file_name="${return_list[1]}.mp4"
       endpoint_url="${return_list[2]}"
       /opt/bin/validate_endpoint.sh "${endpoint_url}" "true"
-      echo "$(date -u +"${ts_format}") [${process_name}] - Start recording: $caps_se_video_record, video file name: $video_file_name"
-      log_node_response
-    fi
-    if [[ "$session_id" != "null" && "$session_id" != "" && "$session_id" != "reserved" && "$recording_started" = "false" && "$caps_se_video_record" = "true" ]]; then
-      video_file="${VIDEO_FOLDER}/$video_file_name"
-      echo "$(date -u +"${ts_format}") [${process_name}] - Starting to record video"
-      ffmpeg -hide_banner -loglevel warning -flags low_delay -threads 2 -fflags nobuffer+genpts -strict experimental -y -f x11grab \
-        -video_size ${VIDEO_SIZE} -r ${FRAME_RATE} -i ${DISPLAY} ${SE_AUDIO_SOURCE} -codec:v ${CODEC} ${PRESET} -pix_fmt yuv420p "$video_file" &
-      FFMPEG_PID=$!
-      if ps -p $FFMPEG_PID >/dev/null; then
-        recording_started="true"
+      if [[ "$caps_se_video_record" = "true" ]]; then
+        echo "$(date -u +"${ts_format}") [${process_name}] - Start recording: $caps_se_video_record, video file name: $video_file_name"
+        log_node_response
+        video_file="${VIDEO_FOLDER}/$video_file_name"
+        echo "$(date -u +"${ts_format}") [${process_name}] - Starting to record video"
+        ffmpeg -hide_banner -loglevel warning -flags low_delay -threads 2 -fflags nobuffer+genpts -strict experimental -y -f x11grab \
+          -video_size ${VIDEO_SIZE} -r ${FRAME_RATE} -i ${DISPLAY} ${SE_AUDIO_SOURCE} -codec:v ${CODEC} ${PRESET} -pix_fmt yuv420p "$video_file" &
+        FFMPEG_PID=$!
+        if ps -p $FFMPEG_PID >/dev/null; then
+          recording_started="true"
+          prev_session_id=$session_id
+        fi
+        echo "$(date -u +"${ts_format}") [${process_name}] - Video recording started"
+        sleep ${poll_interval}
       fi
-      echo "$(date -u +"${ts_format}") [${process_name}] - Video recording started"
-      sleep ${poll_interval}
     elif [[ "$session_id" != "$prev_session_id" && "$recording_started" = "true" ]]; then
       stop_recording
-      wait_for_file_integrity
       if [[ $max_recorded_count -gt 0 ]] && [[ $recorded_count -ge $max_recorded_count ]]; then
         echo "$(date -u +"${ts_format}") [${process_name}] - Node will be drained since max sessions reached count number ($max_recorded_count)"
         exit
       fi
     elif [[ $recording_started = "true" ]]; then
       echo "$(date -u +"${ts_format}") [${process_name}] - Video recording in progress"
       sleep ${poll_interval}
-    else
-      sleep ${poll_interval}
     fi
-    prev_session_id=$session_id
   done
+  stop_if_recording_inprogress
   echo "$(date -u +"${ts_format}") [${process_name}] - Node API is not responding now, exiting..."
 fi