Migrate Sauce Connect GitHub Action from v2 (SC4) to v3 (SC5) (#624)

* Migrate Sauce Connect GitHub Action from v2 (SC4) to v3 (SC5)

Sauce Connect 4 reached end-of-life and Sauce Labs servers now reject
SC4 tunnel connections with "remote shutdown", causing Integration
Tests to fail after 3 retries (see run 34756631021). Bump
saucelabs/sauce-connect-action to v3, which defaults to Sauce Connect
5, and add the now-required region input to each step.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EpTwokDRhY4c4hKZXqX35P

* Use full SC5 region identifiers (us-west-1, eu-central-1)

The v3 action's SC5 CLI rejects the short-form region names used by
v2/SC4 ("us-west", "eu-central"): "Option region contains invalid
value, allowed are: us-west-1, us-east-4, eu-central-1, staging".
Confirmed by the failed run on this PR. Update both the action's
region input and the Sauce Connect YAML config files to match.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EpTwokDRhY4c4hKZXqX35P

* Use distinct apiAddress per Sauce Connect tunnel to fix readiness race

The action's readiness check polls apiAddress/readyz, which defaults
to ':8032' for every invocation. Running both tunnels on the same
runner meant the EU-Central step's readiness check could observe the
already-running US-West process on the shared port and report ready
immediately, before its own tunnel had actually come up (see PR #624
CI run: EU-Central step ended right after "provisioning Sauce
Connect", never logging "Sauce Connect is up"). Give each tunnel its
own apiAddress (:8032 / :8033) so each readiness check is scoped to
its own process.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EpTwokDRhY4c4hKZXqX35P

* Remove nick-invision/retry wrapper around Integration Tests

The outer retry reran the entire "mvn clean test" (including a fresh
JVM/clean) up to 3 times on failure, but doesn't restart the Sauce
Connect tunnels. Once SauceConnectEndpointTest's @afterall tears down
all of the account's tunnels at the end of attempt 1, attempts 2 and 3
have no tunnels at all and every Sauce Connect-dependent test fails,
turning one flaky test into a wall of unrelated failures.

Surefire is already configured with -Dsurefire.rerunFailingTestsCount=2,
which reruns individual failing tests within the same Maven/JVM
invocation (tunnels stay up throughout), giving the same flaky-test
protection without the cascade. Keep the 20-minute timeout as a native
step timeout.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EpTwokDRhY4c4hKZXqX35P

* Increase stopJobTest's status-poll timeout to 60s

stopJobTest was consistently failing with ConditionTimeoutException
waiting for job status to reach "complete" within 20s, across every
CI run in PR #624 (both data centers, every Surefire rerun). Unlike
runTest/runEmulatorTest/runSimulatorTest (which quit the driver
client-side and reliably reach "complete" within 20s), this test stops
the job via the REST API's /stop endpoint, which appears to take
noticeably longer to finalize the job (asset processing, teardown)
than a client-initiated driver.quit(). Give it a 60s budget instead.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EpTwokDRhY4c4hKZXqX35P

* Bump stopJobTest timeout to 90s based on measured live behavior

60s (the previous attempt) still wasn't enough. Reproduced locally
against the live Sauce Labs API and queried the created jobs directly:
both the US-West and EU-Central jobs report
error="User Abandoned Test -- User terminated" and consistently take
~67-70s (creation_time to end_time) to finalize as "complete" after a
REST-initiated stop. Sauce Labs treats an API stop as an abandoned
session and runs it through an idle-detection grace period before
finalizing, which a client can't speed up. 90s gives comfortable
margin above the observed ~70s. Verified locally: both parameterized
cases now pass in ~69s each.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EpTwokDRhY4c4hKZXqX35P

* Drop inline comment explaining stopJobTest's 90s timeout

Rationale (Sauce Labs treats a REST stop as an abandoned session with
a ~67-70s idle-detection grace period before finalizing to "complete")
is already captured in the commit history rather than as a code
comment.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EpTwokDRhY4c4hKZXqX35P

---------

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>

Author: diemol

.github/workflows/java-ci.yml

@@ -76,29 +76,29 @@ jobs:
           cache: 'maven'
 
       - name: Setup Sauce Connect US-West
-        uses: saucelabs/sauce-connect-action@v2
+        uses: saucelabs/sauce-connect-action@v3
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+          region: us-west-1
           tunnelName: github-action-tunnel-us-west
           configFile: ${{ github.workspace }}/src/test/resources/sauce-connect-config-us-west.yaml
+          apiAddress: ':8032'
 
       - name: Setup Sauce Connect EU-Central
-        uses: saucelabs/sauce-connect-action@v2
+        uses: saucelabs/sauce-connect-action@v3
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+          region: eu-central-1
           tunnelName: github-action-tunnel-eu-central
           configFile: ${{ github.workspace }}/src/test/resources/sauce-connect-config-eu-central.yaml
+          apiAddress: ':8033'
 
       - name: Build and Run Integration Tests
         if: ${{ env.NOT_FROM_FORK }} == 'true'
-        uses: nick-invision/retry@v4.0.0
-        with:
-          timeout_minutes: 20
-          max_attempts: 3
-          command: |
-            mvn clean test -Dtest="com.saucelabs.saucerest.integration.**" -Dgpg.skip -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dsurefire.rerunFailingTestsCount=2 -V
+        timeout-minutes: 20
+        run: mvn clean test -Dtest="com.saucelabs.saucerest.integration.**" -Dgpg.skip -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dsurefire.rerunFailingTestsCount=2 -V
 
       - name: Upload JaCoCo report to Codecov
         uses: codecov/codecov-action@v5

.github/workflows/release.yml

@@ -35,20 +35,24 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: Setup Sauce Connect US-West
-        uses: saucelabs/sauce-connect-action@v2
+        uses: saucelabs/sauce-connect-action@v3
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+          region: us-west-1
           tunnelName: github-action-tunnel-us-west
           configFile: ${{ github.workspace }}/src/test/resources/sauce-connect-config-us-west.yaml
+          apiAddress: ':8032'
 
       - name: Setup Sauce Connect EU-Central
-        uses: saucelabs/sauce-connect-action@v2
+        uses: saucelabs/sauce-connect-action@v3
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+          region: eu-central-1
           tunnelName: github-action-tunnel-eu-central
           configFile: ${{ github.workspace }}/src/test/resources/sauce-connect-config-eu-central.yaml
+          apiAddress: ':8033'
 
       - name: Build with Maven
         run: mvn clean install -Dgpg.skip -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -V

.github/workflows/setup-sauce-connect-tunnels.yml

@@ -16,17 +16,21 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Sauce Connect US-West
-        uses: saucelabs/sauce-connect-action@v2
+        uses: saucelabs/sauce-connect-action@v3
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+          region: us-west-1
           tunnelName: github-action-tunnel-us-west
           configFile: ${{ github.workspace }}/src/test/resources/sauce-connect-config-us-west.yaml
+          apiAddress: ':8032'
 
       - name: Setup Sauce Connect EU-Central
-        uses: saucelabs/sauce-connect-action@v2
+        uses: saucelabs/sauce-connect-action@v3
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+          region: eu-central-1
           tunnelName: github-action-tunnel-eu-central
-          configFile: ${{ github.workspace }}/src/test/resources/sauce-connect-config-eu-central.yaml
+          configFile: ${{ github.workspace }}/src/test/resources/sauce-connect-config-eu-central.yaml
+          apiAddress: ':8033'

src/test/java/com/saucelabs/saucerest/integration/JobsEndpointTest.java

@@ -399,7 +399,7 @@ public void stopJobTest(DataCenter dataCenter, TestInfo testInfo) throws IOExcep
     Assertions.assertDoesNotThrow(
         () ->
             Awaitility.await()
-                .atMost(Duration.ofSeconds(20))
+                .atMost(Duration.ofSeconds(90))
                 .pollInterval(Duration.ofSeconds(1))
                 .pollInSameThread()
                 .until(() -> "complete".equals(jobs.get().getJobDetails(finalSessionID).status)));

src/test/resources/sauce-connect-config-eu-central.yaml

@@ -1,2 +1,2 @@
 ---
-region: 'eu-central'
+region: 'eu-central-1'

src/test/resources/sauce-connect-config-us-west.yaml

@@ -1,2 +1,2 @@
 ---
-region: 'us-west'
+region: 'us-west-1'