Merge pull request #72 from seleniumhq-community/4.19.1 [deploy]

VietND96 · VietND96 · commit 496b79aa77dc · 2024-03-31T16:20:09.000Z
Sync upstream 4.19.1

Signed-off-by: Viet Nguyen Duc &lt;nguyenducviet4496@gmail.com&gt;
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -338,7 +338,7 @@ workflows:
     jobs:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-base
-          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          platforms: linux/arm64,linux/amd64
           build-args: --push
           make-targets: base_multi
           machine-type: ubuntu2004arm64large
@@ -349,7 +349,7 @@ workflows:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-full-grid
           requires: [deploy-multi-arch-base]
-          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          platforms: linux/arm64,linux/amd64
           build-args: --push
           make-targets: grid_multi
           machine-type: ubuntu2004arm64
@@ -360,7 +360,7 @@ workflows:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-node-base
           requires: [deploy-multi-arch-base]
-          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          platforms: linux/arm64,linux/amd64
           build-args: --push
           make-targets: node_base_multi
           machine-type: ubuntu2004arm64large
@@ -371,7 +371,7 @@ workflows:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-firefox
           requires: [deploy-multi-arch-node-base]
-          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          platforms: linux/arm64,linux/amd64
           build-args: --push
           make-targets: firefox_multi
           machine-type: ubuntu2004arm64large
@@ -382,7 +382,7 @@ workflows:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-chromium
           requires: [deploy-multi-arch-node-base]
-          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          platforms: linux/arm64,linux/amd64
           build-args: --push
           make-targets: chromium_multi
           machine-type: ubuntu2004arm64large
@@ -393,7 +393,7 @@ workflows:
       - deploy-multi-arch-full-grid:
           name: deploy-multi-arch-release-notes
           requires: [deploy-multi-arch-firefox,deploy-multi-arch-chromium]
-          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          platforms: linux/arm64,linux/amd64
           build-args: --push
           make-targets: tag_and_push_multi_arch_browser_images
           machine-type: ubuntu2004arm64
diff --git a/.github/workflows/test-video.yml b/.github/workflows/test-video.yml
@@ -1,4 +1,4 @@
-name: Test video files
+name: Test Docker Selenium
 concurrency:
   group: ${{ github.workflow }}
 
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-          test-strategy: [test_video, test_parallel]
+          test-strategy: [test_video, test_parallel, test_node_docker]
     steps:
       - uses: actions/checkout@main
       - name: Output Docker info
diff --git a/Base/Dockerfile b/Base/Dockerfile
@@ -6,8 +6,8 @@ LABEL authors="Selenium <selenium-developers@googlegroups.com>"
 ARG VERSION
 ARG RELEASE=selenium-${VERSION}
 # Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/java/maven_deps.bzl)
-ARG OPENTELEMETRY_VERSION=1.35.0
-ARG GRPC_VERSION=1.61.1
+ARG OPENTELEMETRY_VERSION=1.36.0
+ARG GRPC_VERSION=1.62.2
 
 #Arguments to define the user running Selenium
 ARG SEL_USER=seluser
diff --git a/Makefile b/Makefile
@@ -2,10 +2,10 @@ NAME := $(or $(NAME),$(NAME),selenium)
 CURRENT_DATE := $(shell date '+%Y%m%d')
 BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE))
 BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.19.0)
-BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.19.0)
+BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.19.1)
 BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
 BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.20.0-SNAPSHOT)
-VERSION := $(or $(VERSION),$(VERSION),4.19.0)
+VERSION := $(or $(VERSION),$(VERSION),4.19.1)
 TAG_VERSION := $(VERSION)-$(BUILD_DATE)
 CHART_VERSION_NIGHTLY := $(or $(CHART_VERSION_NIGHTLY),$(CHART_VERSION_NIGHTLY),1.0.0-nightly)
 NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
@@ -569,6 +569,25 @@ test_video: video hub chrome firefox edge
 	docker run -u $$(id -u) -v $$(pwd):$$(pwd) -w $$(pwd) $(FFMPEG_BASED_NAME)/ffmpeg:$(FFMPEG_BASED_TAG) -v error -i ./tests/videos/firefox_video.mp4 -f null - 2>error.log
 	docker run -u $$(id -u) -v $$(pwd):$$(pwd) -w $$(pwd) $(FFMPEG_BASED_NAME)/ffmpeg:$(FFMPEG_BASED_TAG) -v error -i ./tests/videos/edge_video.mp4 -f null - 2>error.log
 
+test_node_docker: docker hub chrome firefox edge
+	rm -rf ./tests/videos; mkdir -p ./tests/videos
+	for node in StandaloneChrome StandaloneFirefox StandaloneEdge ; do \
+			cd tests || true ; \
+			echo NAMESPACE=$(NAME) > .env ; \
+			echo TAG=$(TAG_VERSION) >> .env ; \
+			echo VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) >> .env ; \
+			echo TEST_DRAIN_AFTER_SESSION_COUNT=$(or $(TEST_DRAIN_AFTER_SESSION_COUNT), 0) >> .env ; \
+			echo TEST_PARALLEL_HARDENING=$(or $(TEST_PARALLEL_HARDENING), "false") >> .env ; \
+			echo LOG_LEVEL=$(or $(LOG_LEVEL), "INFO") >> .env ; \
+			echo REQUEST_TIMEOUT=$(or $(REQUEST_TIMEOUT), 30) >> .env ; \
+			echo NODE=$$node >> .env ; \
+			echo UID=$$(id -u) >> .env ; \
+			export $$(cat .env | xargs) ; \
+			envsubst < config.toml > ./videos/config.toml ; \
+			docker-compose -f docker-compose-v3-test-node-docker.yaml up --no-log-prefix --exit-code-from tests --build ; \
+			if [ $$? -ne 0 ]; then exit 1; fi ; \
+	done
+
 test_custom_ca_cert:
 	VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) ./tests/customCACert/bootstrap.sh
 
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+
 # Docker images for Selenium, built for Debian ARM64, ARM/v7, and AMD64 
 
 [![seleniumhq-community](https://circleci.com/gh/seleniumhq-community/docker-seleniarm.svg?style=shield)](https://app.circleci.com/pipelines/github/seleniumhq-community/docker-seleniarm)
diff --git a/build-and-push.sh b/build-and-push.sh
@@ -5,7 +5,7 @@ RELEASE=$(grep BASE_RELEASE Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)
 NAME="${NAME:-seleniarm}"
 VERSION="${VERSION:-$SELENIUM_VERSION}"
 BUILD_DATE="${BUILD_DATE:-$(date '+%Y%m%d')}"
-PLATFORMS="${PLATFORMS:-linux/arm64,linux/arm/v7,linux/amd64}"
+PLATFORMS="${PLATFORMS:-linux/arm64,linux/amd64}"
 BUILD_ARGS=--push
 
 FROM_IMAGE_ARGS="--build-arg NAMESPACE=$NAME --build-arg VERSION=$VERSION-$BUILD_DATE"
diff --git a/build-locally.sh b/build-locally.sh
@@ -5,7 +5,7 @@ RELEASE=$(grep BASE_RELEASE Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)
 NAME="${NAME:-seleniarm}"
 VERSION="${VERSION:-$SELENIUM_VERSION}"
 BUILD_DATE="${BUILD_DATE:-$(date '+%Y%m%d')}"
-PLATFORMS="${PLATFORMS:-linux/arm64,linux/arm/v7,linux/amd64}"
+PLATFORMS="${PLATFORMS:-linux/arm64,linux/amd64}"
 #BUILD_ARGS=--push
 
 FROM_IMAGE_ARGS="--build-arg NAMESPACE=$NAME --build-arg VERSION=$VERSION-$BUILD_DATE"
diff --git a/charts/selenium-grid/configs/node/nodePreStop.sh b/charts/selenium-grid/configs/node/nodePreStop.sh
@@ -3,12 +3,14 @@
 probe_name="lifecycle.${1:-"preStop"}"
 
 max_time=3
+retry_time=5
 
 ID=$(echo $RANDOM)
 tmp_node_file="/tmp/nodeProbe${ID}"
 
 function on_exit() {
   rm -rf ${tmp_node_file}
+  echo "$(date +%FT%T%Z) [${probe_name}] - Exiting Node preStop..."
 }
 trap on_exit EXIT
 
@@ -89,8 +91,12 @@ if curl -m ${max_time} -sfk ${SE_SERVER_PROTOCOL}://127.0.0.1:${SE_NODE_PORT}/st
     fi
     signal_node_to_drain
     # Wait for the current session to be finished if any
-    while curl -m ${max_time} -sfk ${SE_SERVER_PROTOCOL}://127.0.0.1:${SE_NODE_PORT}/status -o ${tmp_node_file};
-    do
+    while true; do
+      # Attempt the cURL request and capture the exit status
+      endpoint_http_code=$(curl --retry ${retry_time} -m ${max_time} -sfk ${SE_SERVER_PROTOCOL}://127.0.0.1:${SE_NODE_PORT}/status -o ${tmp_node_file} -w "%{http_code}")
+      endpoint_status=$?
+      echo "$(date +%FT%T%Z) [${probe_name}] - Fetch the Node status via cURL with exit status: ${endpoint_status}, HTTP code: ${endpoint_http_code}"
+
       SLOT_HAS_SESSION=$(jq -e ".value.node.slots[]|select(.session != null).id.id" ${tmp_node_file} | tr -d '"' || "")
       if [ -z "${SLOT_HAS_SESSION}" ]; then
         echo "$(date +%FT%T%Z) [${probe_name}] - There is no session running. Node is ready to be terminated."
@@ -99,7 +105,13 @@ if curl -m ${max_time} -sfk ${SE_SERVER_PROTOCOL}://127.0.0.1:${SE_NODE_PORT}/st
         exit 0
       else
         echo "$(date +%FT%T%Z) [${probe_name}] - Node preStop is waiting for current session on slot ${SLOT_HAS_SESSION} to be finished. Node details: message: $(jq -r '.value.message' ${tmp_node_file} || "unknown"), availability: $(jq -r '.value.node.availability' ${tmp_node_file} || "unknown")"
-        sleep 1;
+        sleep 2;
+      fi
+
+      # If the cURL command failed, break the loop
+      if [ ${endpoint_status} -ne 0 ] || [ "${endpoint_http_code}" != "200" ]; then
+        echo "$(date +%FT%T%Z) [${probe_name}] - Node endpoint returned status ${endpoint_http_code:-"exit ${endpoint_status}"}, probably Node draining complete!"
+        break
       fi
     done
 else
diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml
@@ -113,8 +113,8 @@ nodeConfigMap:
   # Directory where the extra scripts are mounted to
   extraScriptsDirectory: "/opt/selenium"
   extraScripts:
-    nodePreStop.sh:
-    nodeProbe.sh:
+    nodePreStop.sh: ""
+    nodeProbe.sh: ""
   # Name of volume mount is used to mount scripts in the ConfigMap
   scriptVolumeMountName:
   # Automatic browser leftovers cleanup stuck browser processes, tmp files
@@ -136,8 +136,8 @@ recorderConfigMap:
   extraScriptsDirectory: "/opt/bin"
   # List of extra scripts to be mounted to the container. Format as `filename: content`
   extraScripts:
-  #  video.sh:
-  #  video_graphQLQuery.sh:
+  #  video.sh: ""
+  #  video_graphQLQuery.sh: ""
   # Name of volume mount is used to mount scripts in the ConfigMap
   scriptVolumeMountName:
   videoVolumeMountName: videos
@@ -154,7 +154,7 @@ uploaderConfigMap:
   extraScriptsDirectory: "/opt/bin"
   # List of extra scripts to be mounted to the container. Format as `filename: content`
   extraScripts:
-    upload.sh:
+    upload.sh: ""
   # Extra files stored in Secret to be mounted to the container.
   secretFiles:
     upload.conf: "[sample]"
diff --git a/tests/bootstrap.sh b/tests/bootstrap.sh
@@ -8,7 +8,8 @@ if [ "${CI:-false}" = "false" ]; then
 fi
 
 python -m pip install selenium==4.19.0 \
-                      docker===6.1.3 \
+                      docker===7.0.0 \
+                      chardet \
                       | grep -v 'Requirement already satisfied'
 
 if [ "${SELENIUM_GRID_PROTOCOL}" = "https" ]; then
diff --git a/tests/charts/bootstrap.sh b/tests/charts/bootstrap.sh
@@ -13,13 +13,15 @@ python -m pip install pyyaml==6.0.1 \
 
 cd ..
 
+helm package charts/selenium-grid --version 1.0.0-SNAPSHOT -d tests/tests
+
 RELEASE_NAME="selenium"
 
 helm template ${RELEASE_NAME} --values tests/charts/templates/render/dummy.yaml \
   --set-file 'nodeConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
   --set-file 'recorderConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
   --set-file 'uploaderConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
-  charts/selenium-grid > ./tests/tests/dummy_template_manifests.yaml
+  tests/tests/selenium-grid-1.0.0-SNAPSHOT.tgz > ./tests/tests/dummy_template_manifests.yaml
 
 python tests/charts/templates/test.py "./tests/tests/dummy_template_manifests.yaml" ${RELEASE_NAME}
 if [ $? -ne 0 ]; then
@@ -30,14 +32,15 @@ fi
 rm -rf tests/charts/umbrella-charts/Chart.lock tests/charts/umbrella-charts/charts
 helm dependency update tests/charts/umbrella-charts
 helm dependency build tests/charts/umbrella-charts
+helm package tests/charts/umbrella-charts --version 1.0.0-SNAPSHOT -d tests/tests
 
 RELEASE_NAME="test"
 
 helm template ${RELEASE_NAME} --values tests/charts/templates/render/dummy_solution.yaml \
   --set-file 'selenium-grid.nodeConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
   --set-file 'selenium-grid.recorderConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
   --set-file 'selenium-grid.uploaderConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
-  tests/charts/umbrella-charts > ./tests/tests/dummy_solution_template_manifests.yaml
+  tests/tests/umbrella-charts-1.0.0-SNAPSHOT.tgz > ./tests/tests/dummy_solution_template_manifests.yaml
 
 python tests/charts/templates/test.py "./tests/tests/dummy_solution_template_manifests.yaml" ${RELEASE_NAME}
 if [ $? -ne 0 ]; then
diff --git a/tests/charts/ci/base-auth-ingress-values.yaml b/tests/charts/ci/base-auth-ingress-values.yaml
@@ -1,6 +1,7 @@
 global:
   seleniumGrid:
     logLevel: INFO
+    stdoutProbeLog: true
 
 ingress:
   className: nginx
diff --git a/tests/charts/make/chart_setup_env.sh b/tests/charts/make/chart_setup_env.sh
@@ -28,6 +28,13 @@ if [ "$(uname -m)" = "x86_64" ]; then
     sudo apt-get install -yq docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
     sudo docker version
     echo "==============================="
+    echo "Installing Docker compose for AMD64 / x86_64"
+    DOCKER_COMPOSE_VERSION="v2.26.0"
+    curl -fsSL -o ./docker-compose "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64"
+    chmod +x ./docker-compose
+    sudo mv ./docker-compose /usr/libexec/docker/cli-plugins
+    docker compose version
+    echo "==============================="
     if [ "${CLUSTER}" = "kind" ]; then
         echo "Installing kind for AMD64 / x86_64"
         curl -fsSL -o ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64
diff --git a/tests/charts/templates/test.py b/tests/charts/templates/test.py
@@ -154,10 +154,10 @@ def test_extra_script_import_to_node_configmap(self):
         for doc in LIST_OF_DOCUMENTS:
             if doc['metadata']['name'] in resources_name and doc['kind'] == 'ConfigMap':
                 logger.info(f"Assert default file is imported to Node ConfigMap")
-                self.assertTrue(doc['data']['nodeProbe.sh'] is not None)
-                self.assertTrue(doc['data']['nodePreStop.sh'] is not None)
-                self.assertTrue(doc['data']['nodeCustomTask.sh'] is not None)
-                self.assertTrue(doc['data']['setFromCommand.sh'] is not None)
+                self.assertTrue(doc['data']['nodeProbe.sh'] != "")
+                self.assertTrue(doc['data']['nodePreStop.sh'] != "")
+                self.assertTrue(doc['data']['nodeCustomTask.sh'] != "")
+                self.assertTrue(doc['data']['setFromCommand.sh'] != "")
                 count += 1
         self.assertEqual(count, len(resources_name), "No node config resources found")
 
diff --git a/tests/charts/umbrella-charts/values.yaml b/tests/charts/umbrella-charts/values.yaml
@@ -0,0 +1,6 @@
+global:
+  seleniumGrid:
+    imageRegistry: selenium
+
+selenium-grid:
+  enabled: true
diff --git a/tests/config.toml b/tests/config.toml
@@ -0,0 +1,11 @@
+[docker]
+
+configs = [
+    "${NAMESPACE}/standalone-firefox:${TAG}", '{"browserName": "firefox", "platformName": "linux"}',
+    "${NAMESPACE}/standalone-chrome:${TAG}", '{"browserName": "chrome", "platformName": "linux"}',
+    "${NAMESPACE}/standalone-edge:${TAG}", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
+    ]
+
+url = "http://127.0.0.1:2375"
+
+video-image = "${NAMESPACE}/video:${VIDEO_TAG}"
diff --git a/tests/docker-compose-v3-test-node-docker.yaml b/tests/docker-compose-v3-test-node-docker.yaml
@@ -0,0 +1,39 @@
+version: "3"
+services:
+  node-docker:
+    image: ${NAMESPACE}/node-docker:${TAG}
+    volumes:
+      - ./videos:/opt/selenium/assets
+      - ./videos/config.toml:/opt/bin/config.toml
+      - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      - selenium-hub
+    environment:
+      - SE_EVENT_BUS_HOST=selenium-hub
+      - SE_EVENT_BUS_PUBLISH_PORT=4442
+      - SE_EVENT_BUS_SUBSCRIBE_PORT=4443
+      - SE_NODE_ENABLE_MANAGED_DOWNLOADS=true
+      - SE_LOG_LEVEL=FINE
+
+  selenium-hub:
+    image: ${NAMESPACE}/hub:${TAG}
+    container_name: selenium-hub
+    environment:
+      - SE_LOG_LEVEL=${LOG_LEVEL}
+      - SE_SESSION_REQUEST_TIMEOUT=${REQUEST_TIMEOUT}
+    ports:
+      - "4442:4442"
+      - "4443:4443"
+      - "4444:4444"
+
+  tests:
+    image: docker-selenium-tests:latest
+    build:
+      context: ./
+      dockerfile: ./Dockerfile
+    depends_on:
+      - selenium-hub
+    environment:
+      - RUN_IN_DOCKER_COMPOSE=true
+      - SELENIUM_GRID_HOST=selenium-hub
+    command: ["./bootstrap.sh", "${NODE}"]

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+`
`1`	`2`	`# Docker images for Selenium, built for Debian ARM64, ARM/v7, and AMD64`
`2`	`3`
`3`	`4`	`[![seleniumhq-community](https://circleci.com/gh/seleniumhq-community/docker-seleniarm.svg?style=shield)](https://app.circleci.com/pipelines/github/seleniumhq-community/docker-seleniarm)`