Merge remote-tracking branch 'origin/trunk' into python

Author: VietND96

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -56,7 +56,7 @@ body:
     attributes:
       label: Docker Selenium version (image tag)
       description: What version of Docker Selenium are you using?
-      placeholder: 4.29.0-20250303? Please use the full tag, avoid "latest"
+      placeholder: 4.30.0-20250323? Please use the full tag, avoid "latest"
     validations:
       required: true
   - type: input

.github/workflows/build-ffmpeg.yml

@@ -20,7 +20,7 @@ on:
 jobs:
   deploy:
     name: Build and Deploy FFmpeg
-    runs-on: ubuntu-24.04
+    runs-on: blacksmith-8vcpu-ubuntu-2204
     permissions: write-all
     steps:
       - name: Checkout code

.github/workflows/deploy.yml

@@ -51,14 +51,11 @@ jobs:
       - build-test
     if: (contains(toJson(github.event.commits), '[deploy]') == true || (github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'true')) && !failure() && !cancelled()
     name: Deploy and Release
-    runs-on: ubuntu-24.04
+    runs-on: blacksmith-8vcpu-ubuntu-2204
     permissions: write-all
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          large-packages: false
       - name: Checkout code
         uses: actions/checkout@main
         with:

.github/workflows/nightly.yml

@@ -24,14 +24,11 @@ jobs:
       - build-test
     if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && !failure() && !cancelled()
     name: Deploy and Release Nightly
-    runs-on: ubuntu-24.04
+    runs-on: blacksmith-8vcpu-ubuntu-2204
     permissions: write-all
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          large-packages: false
       - name: Checkout code
         uses: actions/checkout@main
         with:

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

@@ -22,7 +22,7 @@ on:
         description: 'Build date in format YYYYMMDD. Must provide if reusing base image'
         required: false
         type: string
-        default: '20250303'
+        default: '20250323'
       browser-name:
         description: 'Browser name to build. E.g: chrome'
         required: true

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

@@ -22,7 +22,7 @@ on:
         description: 'Build date in format YYYYMMDD. Must provide if reusing base image'
         required: false
         type: string
-        default: '20250303'
+        default: '20250323'
       browser-name:
         description: 'Browser name to build. E.g: edge'
         required: true

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

@@ -22,7 +22,7 @@ on:
         description: 'Build date in format YYYYMMDD. Must provide if reusing base image'
         required: false
         type: string
-        default: '20250303'
+        default: '20250323'
       browser-name:
         description: 'Browser name to build. E.g: firefox'
         required: true

.keda/README.md

@@ -13,9 +13,9 @@ The stable implementation will be merged to the upstream KEDA repository frequen
 Replace the image registry and tag of these KEDA components with the patched image tag:
 
 ```bash
-docker pull selenium/keda:2.16.1-selenium-grid-20250303
-docker pull selenium/keda-metrics-apiserver:2.16.1-selenium-grid-20250303
-docker pull selenium/keda-admission-webhooks:2.16.1-selenium-grid-20250303
+docker pull selenium/keda:2.16.1-selenium-grid-20250323
+docker pull selenium/keda-metrics-apiserver:2.16.1-selenium-grid-20250323
+docker pull selenium/keda-admission-webhooks:2.16.1-selenium-grid-20250323
 ```
 
 Besides that, you also can use image tag `latest` or `nightly`.
@@ -27,15 +27,15 @@ If you are deploying KEDA core using their official Helm [chart](https://github.
     keda:
       registry: selenium
       repository: keda
-      tag: "2.16.1-selenium-grid-20250303"
+      tag: "2.16.1-selenium-grid-20250323"
     metricsApiServer:
       registry: selenium
       repository: keda-metrics-apiserver
-      tag: "2.16.1-selenium-grid-20250303"
+      tag: "2.16.1-selenium-grid-20250323"
     webhooks:
       registry: selenium
       repository: keda-admission-webhooks
-      tag: "2.16.1-selenium-grid-20250303"
+      tag: "2.16.1-selenium-grid-20250323"
 ```
 
 If you are deployment Selenium Grid chart with `autoscaling.enabled` is `true` (implies installing KEDA sub-chart), KEDA images registry and tag already set in the `values.yaml`. Refer to list [configuration](../charts/selenium-grid/CONFIGURATION.md).

.keda/scalers/selenium_grid_scaler.go

@@ -46,6 +46,11 @@ type seleniumGridScalerMetadata struct {
 	TargetValue int64
 }
 
+type Platform struct {
+	name   string
+	family *Platform
+}
+
 type SeleniumResponse struct {
 	Data Data `json:"data"`
 }
@@ -350,9 +355,8 @@ func checkRequestCapabilitiesMatch(request map[string]interface{}, browserName s
 		(_browserVersion != "" && strings.HasPrefix(browserVersion, _browserVersion))
 
 	// Check if platformName matches
-	_platformName := getPlatformName(request)
-	platformNameMatch := (_platformName == "" || strings.EqualFold("any", _platformName) || strings.EqualFold(platformName, _platformName)) &&
-		(platformName == "" || platformName == "any" || strings.EqualFold(platformName, _platformName))
+	platformNameMatch := strings.EqualFold(GetPlatform(platformName).name, GetPlatform(getPlatformName(request)).name) ||
+		isSameFamily(GetPlatform(platformName), GetPlatform(getPlatformName(request)))
 
 	return browserNameMatch && browserVersionMatch && platformNameMatch && managedDownloadsEnabled(capabilities, request) && extensionCapabilitiesMatch(request, capabilities)
 }
@@ -371,9 +375,8 @@ func checkStereotypeCapabilitiesMatch(capability map[string]interface{}, browser
 		(_browserVersion != "" && strings.HasPrefix(browserVersion, _browserVersion))
 
 	// Check if platformName matches
-	_platformVersion := getPlatformName(capability)
-	platformNameMatch := (_platformVersion == "" || strings.EqualFold("any", _platformVersion) || strings.EqualFold(platformName, _platformVersion)) &&
-		(platformName == "" || platformName == "any" || strings.EqualFold(platformName, _platformVersion))
+	platformNameMatch := strings.EqualFold(GetPlatform(platformName).name, GetPlatform(getPlatformName(capability)).name) ||
+		isSameFamily(GetPlatform(platformName), GetPlatform(getPlatformName(capability)))
 
 	return browserNameMatch && browserVersionMatch && platformNameMatch && managedDownloadsEnabled(capabilities, capability) && extensionCapabilitiesMatch(capability, capabilities)
 }
@@ -489,3 +492,107 @@ func getCountFromSeleniumResponse(b []byte, browserName string, browserVersion s
 
 	return int64(len(newRequestNodes)), onGoingSessions, nil
 }
+
+// Mapping of platform name enum used in the Selenium Grid core
+// https://github.com/SeleniumHQ/selenium/blob/trunk/java/src/org/openqa/selenium/Platform.java
+var (
+	Windows      = Platform{"windows", nil}
+	XP           = Platform{"Windows XP", &Windows}
+	Vista        = Platform{"Windows Vista", &Windows}
+	Win7         = Platform{"Windows 7", &Windows}
+	Win8         = Platform{"Windows 8", &Windows}
+	Win8_1       = Platform{"Windows 8.1", &Windows}
+	Win10        = Platform{"Windows 10", &Windows}
+	Win11        = Platform{"Windows 11", &Windows}
+	Mac          = Platform{"mac", nil}
+	SnowLeopard  = Platform{"OS X 10.6", &Mac}
+	MountainLion = Platform{"OS X 10.8", &Mac}
+	Mavericks    = Platform{"OS X 10.9", &Mac}
+	Yosemite     = Platform{"OS X 10.10", &Mac}
+	ElCapitan    = Platform{"OS X 10.11", &Mac}
+	Sierra       = Platform{"macOS 10.12", &Mac}
+	HighSierra   = Platform{"macOS 10.13", &Mac}
+	Mojave       = Platform{"macOS 10.14", &Mac}
+	Catalina     = Platform{"macOS 10.15", &Mac}
+	BigSur       = Platform{"macOS 11.0", &Mac}
+	Monterey     = Platform{"macOS 12.0", &Mac}
+	Ventura      = Platform{"macOS 13.0", &Mac}
+	Sonoma       = Platform{"macOS 14.0", &Mac}
+	Sequoia      = Platform{"macOS 15.0", &Mac}
+	Unix         = Platform{"unix", nil}
+	Linux        = Platform{"linux", &Unix}
+	Bsd          = Platform{"bsd", &Unix}
+	Solaris      = Platform{"solaris", &Unix}
+	Android      = Platform{"android", nil}
+	IOS          = Platform{"iOS", nil}
+	Any          = Platform{"any", nil}
+)
+
+func isSameFamily(p1, p2 Platform) bool {
+	return p1.family != nil && p2.family != nil && p1.family == p2.family
+}
+
+func GetPlatform(input string) Platform {
+	switch strings.ToLower(input) {
+	case "windows":
+		return Windows
+	case "windows server 2003", "xp", "winnt", "windows_nt", "windows nt":
+		return XP
+	case "windows server 2008", "windows vista":
+		return Vista
+	case "windows 7", "win7":
+		return Win7
+	case "windows server 2012", "windows 8", "win8":
+		return Win8
+	case "windows 8.1", "win8.1":
+		return Win8_1
+	case "windows 10", "win10":
+		return Win10
+	case "windows 11", "win11":
+		return Win11
+	case "mac", "darwin", "macos", "mac os x", "os x":
+		return Mac
+	case "os x 10.6", "macos 10.6", "snow leopard":
+		return SnowLeopard
+	case "os x 10.8", "macos 10.8", "mountain lion":
+		return MountainLion
+	case "os x 10.9", "macos 10.9", "mavericks":
+		return Mavericks
+	case "os x 10.10", "macos 10.10", "yosemite":
+		return Yosemite
+	case "os x 10.11", "macos 10.11", "el capitan":
+		return ElCapitan
+	case "os x 10.12", "macos 10.12", "sierra":
+		return Sierra
+	case "os x 10.13", "macos 10.13", "high sierra":
+		return HighSierra
+	case "os x 10.14", "macos 10.14", "mojave":
+		return Mojave
+	case "os x 10.15", "macos 10.15", "catalina":
+		return Catalina
+	case "os x 11.0", "macos 11.0", "big sur":
+		return BigSur
+	case "os x 12.0", "macos 12.0", "monterey":
+		return Monterey
+	case "os x 13.0", "macos 13.0", "ventura":
+		return Ventura
+	case "os x 14.0", "macos 14.0", "sonoma":
+		return Sonoma
+	case "os x 15.0", "macos 15.0", "sequoia":
+		return Sequoia
+	case "linux":
+		return Linux
+	case "bsd":
+		return Bsd
+	case "solaris":
+		return Solaris
+	case "android", "dalvik":
+		return Android
+	case "ios":
+		return IOS
+	case "any", "":
+		return Any
+	default:
+		return Platform{strings.ToLower(input), nil}
+	}
+}

CHANGELOG/4.30.0/chrome_100.md

@@ -0,0 +1,21 @@
+```
+./tag_and_push_browser_images.sh 4.30.0 20250323 selenium false chrome true
+Tagging images for browser chrome, version 4.30.0, build date 20250323, namespace selenium
+Selenium Grid version -> 4.30.0-20250323
+Chrome version -> 100.0.4896.127
+Short Chrome version -> 100.0
+ChromeDriver version -> 100.0.4896.60
+Short ChromeDriver version -> 100.0
+Tagged selenium/node-chrome:100.0.4896.127-chromedriver-100.0.4896.60-grid-4.30.0-20250323
+Tagged selenium/standalone-chrome:100.0.4896.127-chromedriver-100.0.4896.60-grid-4.30.0-20250323
+Tagged selenium/node-chrome:100.0.4896.127-chromedriver-100.0.4896.60-20250323
+Tagged selenium/standalone-chrome:100.0.4896.127-chromedriver-100.0.4896.60-20250323
+Tagged selenium/node-chrome:100.0.4896.127-20250323
+Tagged selenium/standalone-chrome:100.0.4896.127-20250323
+Tagged selenium/node-chrome:100.0-chromedriver-100.0-grid-4.30.0-20250323
+Tagged selenium/standalone-chrome:100.0-chromedriver-100.0-grid-4.30.0-20250323
+Tagged selenium/node-chrome:100.0-chromedriver-100.0-20250323
+Tagged selenium/standalone-chrome:100.0-chromedriver-100.0-20250323
+Tagged selenium/node-chrome:100.0-20250323
+Tagged selenium/standalone-chrome:100.0-20250323
+```