From 25c1a1bb18358c3d73fcd4fbd18d7be30bd82869 Mon Sep 17 00:00:00 2001
From: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
Date: Fri, 31 Jul 2026 21:21:56 +0000
Subject: [PATCH] ci: use W3C-compliant Sauce Labs tunnelName and remove
 deprecated tunnelIdentifier

---
 .github/workflows/ci.yml                      |  1 +
 tests/e2e/assets/protractor-saucelabs.conf.js | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df2496715699..b8f88adf0331 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -219,6 +219,7 @@ jobs:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Start Sauce Connect
         uses: saucelabs/sauce-connect-action@cb88b508c6f9ff4d84490093733315dbd55de022 # v3
+        timeout-minutes: 10
         with:
           username: ${{ vars.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
diff --git a/tests/e2e/assets/protractor-saucelabs.conf.js b/tests/e2e/assets/protractor-saucelabs.conf.js
index 799d0901d4fb..7ec516309eec 100644
--- a/tests/e2e/assets/protractor-saucelabs.conf.js
+++ b/tests/e2e/assets/protractor-saucelabs.conf.js
@@ -63,19 +63,17 @@ exports.config = {
 
   // NOTE: https://saucelabs.com/products/platform-configurator can be used to determine configuration values
   multiCapabilities: capabilities.map((caps) => {
+    const { version, platform, ...rest } = caps;
     const w3cCaps = {
-      ...caps,
-      browserVersion: caps.version,
-      platformName: caps.platform,
+      ...rest,
+      browserVersion: version,
+      platformName: platform,
     };
 
     if (tunnelIdentifier) {
       return {
         ...w3cCaps,
-        tunnelIdentifier,
-        tunnelName: tunnelIdentifier,
         'sauce:options': {
-          tunnelIdentifier,
           tunnelName: tunnelIdentifier,
         },
       };