Merge remote-tracking branch 'origin/trunk' into browser-node-changelog

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

.github/workflows/deploy.yml

@@ -211,7 +211,7 @@ jobs:
       - name: Create Release
         if: env.LATEST_TAG != env.NEXT_TAG
         id: create_release
-        uses: softprops/[email protected].3
+        uses: softprops/[email protected].4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: "${{ env.GRID_VERSION }}-${{ env.BUILD_DATE }}"

.github/workflows/nightly.yml

@@ -148,7 +148,7 @@ jobs:
           command: make chart_release
       - name: Create Nightly Release
         id: create_release
-        uses: softprops/[email protected].3
+        uses: softprops/[email protected].4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ env.BASE_RELEASE }}

.github/workflows/release-chrome-versions.yml

@@ -78,7 +78,7 @@ jobs:
           timeout_minutes: 10
           max_attempts: 3
           command: |
-            make setup_dev_env
+            INSTALL_DOCKER=false make setup_dev_env
       - name: Output Docker info
         run: docker info
       - name: Set Selenium base version
@@ -121,7 +121,9 @@ jobs:
           command: |
             make update_browser_versions_matrix
             ./tests/build-backward-compatible/bootstrap.sh ${GRID_VERSION} ${BROWSER_VERSION} ${BROWSER_NAME} ${REUSE_BASE}
+            EXIT_CODE=$?
             cat .env | xargs -I {} echo {} >> $GITHUB_ENV
+            exit $EXIT_CODE
       - name: Build Hub image for testing
         if: env.REUSE_BASE == 'false'
         run: make hub

.github/workflows/release-edge-versions.yml

@@ -78,7 +78,7 @@ jobs:
           timeout_minutes: 10
           max_attempts: 3
           command: |
-            make setup_dev_env
+            INSTALL_DOCKER=false make setup_dev_env
       - name: Output Docker info
         run: docker info
       - name: Set Selenium base version

.github/workflows/release-firefox-versions.yml

@@ -78,7 +78,7 @@ jobs:
           timeout_minutes: 10
           max_attempts: 3
           command: |
-            make setup_dev_env
+            INSTALL_DOCKER=false make setup_dev_env
       - name: Output Docker info
         run: docker info
       - name: Set Selenium base version

Base/Dockerfile

@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.source="https://github.com/${AUTHORS}/docker-sele
 ARG VERSION
 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.54.0
+ARG OPENTELEMETRY_VERSION=1.54.1
 ARG GRPC_VERSION=1.75.0
 ARG NETTY_VERSION=4.2.6.Final
 ARG CS_VERSION=2.1.25-M18
@@ -143,6 +143,8 @@ RUN --mount=type=secret,id=SEL_PASSWD \
         java -jar /tmp/cs fetch --classpath --cache /external_jars \
         io.opentelemetry:opentelemetry-exporter-otlp:${OPENTELEMETRY_VERSION} \
         io.grpc:grpc-netty:${GRPC_VERSION} \
+        io.netty:netty-handler-proxy:${NETTY_VERSION} \
+        io.netty:netty-parent:${NETTY_VERSION} \
         io.netty:netty-codec-http:${NETTY_VERSION} \
         io.netty:netty-codec-http2:${NETTY_VERSION} \
         io.netty:netty-codec:${NETTY_VERSION} \

CHANGELOG/README.md

@@ -0,0 +1,76 @@
+#!/usr/bin/env python3
+import os
+import re
+from collections import defaultdict
+
+
+def scan_changelog():
+    matrix = defaultdict(lambda: defaultdict(set))
+
+    for grid_version in os.listdir('.'):
+        if not os.path.isdir(grid_version) or not re.match(r'\d+\.\d+\.\d+', grid_version):
+            continue
+
+        for file in os.listdir(grid_version):
+            if file.endswith('.md'):
+                match = re.match(r'(\w+)_(\d+)\.md', file)
+                if match:
+                    browser, version = match.groups()
+                    matrix[grid_version][browser].add(int(version))
+
+    return matrix
+
+
+def generate_readme(matrix):
+    all_browsers = set()
+    all_versions = defaultdict(set)
+
+    for grid_versions in matrix.values():
+        for browser, versions in grid_versions.items():
+            all_browsers.add(browser)
+            all_versions[browser].update(versions)
+
+    browsers = sorted(all_browsers)
+    grid_versions = sorted(matrix.keys(), key=lambda x: [int(i) for i in x.split('.')], reverse=True)
+
+    readme = """# Selenium Grid x Browser Version Matrix
+
+This matrix shows available Docker images with packaged Selenium Grid and browser versions. It helps users quickly identify which image tags to pull for their testing needs.
+
+**Motivation**: To supply the latest Selenium Grid core version with new functionality while keeping users able to use it for testing purposes like cross-browser testing or pinning a browser version due to limited support or issues at specific browser versions. We deliver Docker images for Node and Standalone with packaging both Grid and specific driver/browser versions. Users just find the image tag, pull the image they need and start their tests.
+
+**How to read**: Each ✓ links to detailed changelog information for that specific browser version in the corresponding Grid release. Latest versions appear first (descending order).
+
+**Note**: We don't have full testing to ensure every combination of Grid and browser version will function fully as expected. Users need to evaluate and make their own decisions based on their testing requirements.
+
+"""
+
+    for browser in browsers:
+        versions = sorted(all_versions[browser], reverse=True)
+        readme += f"## {browser.title()}\n\n"
+        readme += "| Grid Version | " + " | ".join(map(str, versions)) + " |\n"
+        readme += "|" + "-" * 14 + "|" + "|".join(["-" * 4 for _ in versions]) + "|\n"
+
+        for grid_version in grid_versions:
+            row = f"| {grid_version} |"
+            for version in versions:
+                if version in matrix[grid_version][browser]:
+                    mark = f" [✓]({grid_version}/{browser}_{version}.md) "
+                else:
+                    mark = "   "
+                row += f"{mark}|"
+            readme += row + "\n"
+        readme += "\n"
+
+    return readme
+
+
+if __name__ == "__main__":
+    os.chdir('./CHANGELOG')
+    matrix = scan_changelog()
+    readme_content = generate_readme(matrix)
+
+    with open('README.md', 'w') as f:
+        f.write(readme_content)
+
+    print("README.md generated successfully!")

CHANGELOG/generate-matrix-readme.py

@@ -106,7 +106,8 @@ update_selenium_version_matrix: install_python_deps
 update_browser_versions_matrix: update_selenium_version_matrix
 	python3 tests/build-backward-compatible/fetch_firefox_version.py ; \
 	python3 tests/build-backward-compatible/fetch_version.py ; \
-	python3 tests/build-backward-compatible/update_workflow_versions.py
+	python3 tests/build-backward-compatible/update_workflow_versions.py ; \
+	python3 CHANGELOG/generate-matrix-readme.py
 
 lint_format_scripts: format_makefile format_shell_scripts format_python_scripts generate_readme_charts
 	git diff --stat --exit-code ; \
@@ -171,7 +172,7 @@ node_base: base video
 	cd ./NodeBase && SEL_PASSWD=$(SEL_PASSWD) docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=video --build-arg VERSION=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) --secret id=SEL_PASSWD -t $(NAME)/node-base:$(TAG_VERSION) .
 
 chrome_only:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Google Chrome is only supported on linux/amd64" \
 		&& cd ./NodeChrome && docker buildx build --platform linux/amd64 $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-chrome:$(TAG_VERSION) . \
@@ -193,7 +194,7 @@ chromium: node_base
 	cd ./NodeChromium && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg CHROMIUM_VERSION=$(CHROMIUM_VERSION) -t $(NAME)/node-chromium:$(TAG_VERSION) .
 
 edge_only:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Microsoft Edge is only supported on linux/amd64" \
 		&& cd ./NodeEdge && docker buildx build --platform linux/amd64 $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-edge:$(TAG_VERSION) . \
@@ -242,7 +243,7 @@ standalone_firefox_beta: firefox_beta
 	--build-arg NAMESPACE=$(NAME) --build-arg VERSION=beta --build-arg BASE=node-firefox -t $(NAME)/standalone-firefox:beta .
 
 standalone_chrome_only:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Google Chrome is only supported on linux/amd64" \
 		&& cd ./Standalone && docker buildx build --platform linux/amd64 $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-chrome -t $(NAME)/standalone-chrome:$(TAG_VERSION) . \
@@ -266,7 +267,7 @@ standalone_chromium: chromium
 	cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-chromium -t $(NAME)/standalone-chromium:$(TAG_VERSION) .
 
 standalone_edge_only:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Microsoft Edge is only supported on linux/amd64" \
 		&& cd ./Standalone && docker buildx build --platform linux/amd64 $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-edge -t $(NAME)/standalone-edge:$(TAG_VERSION) . \
@@ -694,7 +695,7 @@ test: test_chrome \
 	test_standalone_all_browsers
 
 test_chrome:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Google Chrome is only supported on linux/amd64" \
 		&& PLATFORMS=linux/amd64 VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BASE_RELEASE=$(BASE_RELEASE) BASE_VERSION=$(BASE_VERSION) BINDING_VERSION=$(BINDING_VERSION) SKIP_BUILD=true ./tests/bootstrap.sh NodeChrome \
@@ -716,7 +717,7 @@ test_chrome_standalone:
 	esac
 
 test_chrome_standalone_java:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Google Chrome is only supported on linux/amd64" \
 		&& PLATFORMS=linux/amd64 VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BASE_RELEASE=$(BASE_RELEASE) BASE_VERSION=$(BASE_VERSION) BINDING_VERSION=$(BINDING_VERSION) SKIP_BUILD=true ./tests/SeleniumJavaTests/bootstrap_java.sh chrome standalone-chrome \
@@ -727,7 +728,7 @@ test_chrome_standalone_java:
 	esac
 
 test_edge:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Microsoft Edge is only supported on linux/amd64" \
 		&& PLATFORMS=linux/amd64 VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BASE_RELEASE=$(BASE_RELEASE) BASE_VERSION=$(BASE_VERSION) BINDING_VERSION=$(BINDING_VERSION) SKIP_BUILD=true ./tests/bootstrap.sh NodeEdge \
@@ -738,7 +739,7 @@ test_edge:
 	esac
 
 test_edge_standalone:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Microsoft Edge is only supported on linux/amd64" \
 		&& PLATFORMS=linux/amd64 VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BASE_RELEASE=$(BASE_RELEASE) BASE_VERSION=$(BASE_VERSION) BINDING_VERSION=$(BINDING_VERSION) SKIP_BUILD=true ./tests/bootstrap.sh StandaloneEdge \
@@ -749,7 +750,7 @@ test_edge_standalone:
 	esac
 
 test_edge_standalone_java:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Microsoft Edge is only supported on linux/amd64" \
 		&& PLATFORMS=linux/amd64 VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BASE_RELEASE=$(BASE_RELEASE) BASE_VERSION=$(BASE_VERSION) BINDING_VERSION=$(BINDING_VERSION) SKIP_BUILD=true ./tests/SeleniumJavaTests/bootstrap_java.sh edge standalone-edge \
@@ -783,7 +784,7 @@ test_chromium_standalone_java:
 	PLATFORMS=$(PLATFORMS) VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BASE_RELEASE=$(BASE_RELEASE) BASE_VERSION=$(BASE_VERSION) BINDING_VERSION=$(BINDING_VERSION) SKIP_BUILD=true ./tests/SeleniumJavaTests/bootstrap_java.sh chrome standalone-chromium
 
 test_node_all_browsers:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Microsoft Edge is only supported on linux/amd64" \
 		&& PLATFORMS=linux/amd64 VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BASE_RELEASE=$(BASE_RELEASE) BASE_VERSION=$(BASE_VERSION) BINDING_VERSION=$(BINDING_VERSION) SKIP_BUILD=true ./tests/bootstrap.sh NodeAllEdge \
@@ -797,7 +798,7 @@ test_node_all_browsers:
 	./tests/bootstrap.sh NodeAllFirefox
 
 test_standalone_all_browsers:
-	case "$(PLATFORMS)" in \
+	set -e; case "$(PLATFORMS)" in \
 		*linux/amd64*) \
 		echo "Microsoft Edge is only supported on linux/amd64" \
 		&& PLATFORMS=linux/amd64 VERSION=$(TAG_VERSION) NAMESPACE=$(NAMESPACE) BASE_RELEASE=$(BASE_RELEASE) BASE_VERSION=$(BASE_VERSION) BINDING_VERSION=$(BINDING_VERSION) SKIP_BUILD=true ./tests/bootstrap.sh StandaloneAllEdge \

Makefile

@@ -25,10 +25,12 @@ apt-get update -qqy
 
 # Install Chrome based on version specification
 if echo "${CHROME_VERSION}" | grep -qE "google-chrome-stable[_|=][0-9]*"; then
+  # This is version specific standard when install from apt repository e.g google-chrome-stable=121.0.6167.120-1
   # Install specific version
+  VERSION_NUMBER=$(echo "$CHROME_VERSION" | cut -d'=' -f2)
   CHROME_VERSION=$(echo "$CHROME_VERSION" | tr '=' '_')
-  echo "Installing specific Chrome version: ${CHROME_VERSION}"
-  wget -qO google-chrome.deb "https://mirror.cs.uchicago.edu/google-chrome/pool/main/g/google-chrome-stable/${CHROME_VERSION}_$(dpkg --print-architecture).deb"
+  echo "Installing specific Chrome version: ${VERSION_NUMBER}"
+  wget -qO google-chrome.deb "https://github.com/NDViet/google-chrome-stable/releases/download/${VERSION_NUMBER}/${CHROME_VERSION}_$(dpkg --print-architecture).deb"
   apt-get -qqy --no-install-recommends install --allow-downgrades ./google-chrome.deb
   rm -rf google-chrome.deb
 else