From 48fc8a1197ed05475d95704599d90050703dc8cc Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Tue, 25 Nov 2025 16:43:35 -0800 Subject: [PATCH 1/4] revert to using old version, but check that it's valid --- conftest.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/conftest.py b/conftest.py index 48c02472f..143ac6bbc 100644 --- a/conftest.py +++ b/conftest.py @@ -504,7 +504,13 @@ def driver( WebDriverWait(driver, timeout=40).until( EC.presence_of_element_located((By.TAG_NAME, "body")) ) - json_metadata["fx_version"] = _get_version(driver) + displayed_version, _ = _get_version(driver).split(" ") + if displayed_version not in version: + raise ValueError( + f"Mismatch between displayed version {displayed_version}" + f" and actual version {version}" + ) + json_metadata["fx_version"] = version json_metadata["machine_config"] = machine_config json_metadata["suite_id"] = suite_id json_metadata["test_case"] = test_case From f57d704048c95018205640975cb871c84030ad35 Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Tue, 25 Nov 2025 16:45:24 -0800 Subject: [PATCH 2/4] revert to using old version, but check that it's valid --- conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conftest.py b/conftest.py index 143ac6bbc..e56624d9b 100644 --- a/conftest.py +++ b/conftest.py @@ -504,7 +504,7 @@ def driver( WebDriverWait(driver, timeout=40).until( EC.presence_of_element_located((By.TAG_NAME, "body")) ) - displayed_version, _ = _get_version(driver).split(" ") + displayed_version = _get_version(driver).split(" ")[0] if displayed_version not in version: raise ValueError( f"Mismatch between displayed version {displayed_version}" From c78db6d77dbcf6b7fd21c219f8b3d913bb2854fc Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Tue, 25 Nov 2025 16:49:23 -0800 Subject: [PATCH 3/4] fix tc for manifests --- taskcluster/kinds/new-beta-qa/kind.yml | 1 + taskcluster/kinds/new-devedition-qa/kind.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/taskcluster/kinds/new-beta-qa/kind.yml b/taskcluster/kinds/new-beta-qa/kind.yml index 9692cbd45..e3856fd60 100644 --- a/taskcluster/kinds/new-beta-qa/kind.yml +++ b/taskcluster/kinds/new-beta-qa/kind.yml @@ -15,6 +15,7 @@ task-defaults: type: directory env: TESTRAIL_REPORT: "true" + STARFOX_MANIFEST: "./manifests/smoke.yaml" routes: - notify.slack-channel.C07AHPJ525V.on-resolved scopes: diff --git a/taskcluster/kinds/new-devedition-qa/kind.yml b/taskcluster/kinds/new-devedition-qa/kind.yml index e82b3f9dc..2b282e867 100644 --- a/taskcluster/kinds/new-devedition-qa/kind.yml +++ b/taskcluster/kinds/new-devedition-qa/kind.yml @@ -15,6 +15,7 @@ task-defaults: type: directory env: TESTRAIL_REPORT: "true" + STARFOX_MANIFEST: "./manifests/smoke.yaml" routes: - notify.slack-channel.C07AHPJ525V.on-resolved scopes: From 5a45e75c2987431a9bd38b09b856cad65177b1c1 Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Tue, 25 Nov 2025 16:54:32 -0800 Subject: [PATCH 4/4] other cleanup --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 10c74b8d9..d63f92ad2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,7 +70,7 @@ jobs: "@ New-item -Name .env -Value $env_contents -ItemType File -Force Write-Host "Running report for most recent Beta on Windows" - Write-Host "$env:TESTRAIL_USERNAME" + Write-Host "$env:TESTRAIL_REPORT" - name: Select Test Set if: ${{ inputs.test_set != null }} run: |