From 15d741d9563ed128383b8e9b755b8081418a4d3e Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Fri, 25 Jul 2025 15:02:47 -0700 Subject: [PATCH 01/14] create ci dispatch flow --- .github/workflows/ci-dispatch.yml | 65 +++++++++++++++++++++++++++++++ .github/workflows/l10n.yml | 12 ++++-- .github/workflows/smoke.yml | 12 ++++-- choose_test_channel.py | 61 +++++++++++++++++++++++++++++ l10n_CM/run_l10n.py | 2 +- modules/testrail_integration.py | 7 +++- 6 files changed, 149 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/ci-dispatch.yml create mode 100644 choose_test_channel.py diff --git a/.github/workflows/ci-dispatch.yml b/.github/workflows/ci-dispatch.yml new file mode 100644 index 000000000..963ce7784 --- /dev/null +++ b/.github/workflows/ci-dispatch.yml @@ -0,0 +1,65 @@ +--- +name: DTE Automation Dispatch + +run-name: CI tests kicked off by ${{ github.actor }} +on: + pull_request: + +jobs: + Select-Channels: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Select test channels + id: dispatch + run: | + pip3 install 'pipenv==2023.11.15'; + pipenv install + echo channels=$(pipenv run python choose_test_channel.py) >> "$GITHUB_OUTPUT" + + + Run-Win-Smoke: + needs: Select-Channels + if: contains(fromJSON(needs.dispatch.outputs.channels), 'smoke') + uses: ./.github/workflows/smoke.yml + with: + job_to_run: Smoke-Windows + is_pull_request: true + secrets: inherit + + Run-Mac-Smoke: + needs: Select-Channels + if: contains(fromJSON(needs.dispatch.outputs.channels), 'smoke') + uses: ./.github/workflows/smoke.yml + with: + job_to_run: Smoke-MacOS + is_pull_request: true + secrets: inherit + + Run-Win-L10n: + needs: Select-Channels + if: contains(fromJSON(needs.dispatch.outputs.channels), 'l10n') + uses: ./.github/workflows/l10n.yml + with: + job_to_run: L10n-Windows + is_pull_request: true + secrets: inherit + + Run-Mac-L10n: + needs: Select-Channels + if: contains(fromJSON(needs.dispatch.outputs.channels), 'l10n') + uses: ./.github/workflows/l10n.yml + with: + job_to_run: L10n-MacOS + is_pull_request: true + secrets: inherit + + Run-Linux-L10n: + needs: Select-Channels + if: contains(fromJSON(needs.dispatch.outputs.channels), 'l10n') + uses: ./.github/workflows/l10n.yml + with: + job_to_run: L10n-Linux + is_pull_request: true + secrets: inherit diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml index 9367ec968..e7bc7be5a 100644 --- a/.github/workflows/l10n.yml +++ b/.github/workflows/l10n.yml @@ -3,7 +3,6 @@ name: L10N Test Execution run-name: ${{ github.actor }} is running l10n tests on: - pull_request: workflow_call: inputs: channel: @@ -14,6 +13,11 @@ on: job_to_run: required: true type: string + is_pull_request: + description: "Is this a PR?" + default: false + type: boolean + required: true workflow_dispatch: inputs: win_installer_link: @@ -56,7 +60,7 @@ jobs: with: python-version: "3.11" - name: Set Environment (Scheduled Beta) - if: ${{ inputs.job_to_run == 'L10N-MacOS' }} + if: ${{ inputs.job_to_run == 'L10N-MacOS' && inputs.is_pull_request == false }} run: | echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV"; echo "Running report for most recent Beta on MacOS"; @@ -141,7 +145,7 @@ jobs: with: python-version: "3.11" - name: Set Environment (Scheduled Beta) - if: ${{ inputs.job_to_run == 'L10N-Linux' }} + if: ${{ inputs.job_to_run == 'L10N-Linux' && inputs.is_pull_request == false }} run: | echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV"; echo "Running report for most recent Beta on Linux"; @@ -232,7 +236,7 @@ jobs: New-item -Name .env -Value $env_contents -ItemType File -Force Write-Host "Running l10n tests on supplied executable" - name: Set Environment (Scheduled Beta) - if: ${{ inputs.job_to_run == 'L10N-Windows' }} + if: ${{ inputs.job_to_run == 'L10N-Windows' && inputs.is_pull_request == false}} run: | $env_contents = @" TESTRAIL_REPORT='true' diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index 2e171eddc..c551111b8 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -3,7 +3,6 @@ name: Smoke Test Execution run-name: ${{ github.actor }} is running smoke tests on: - pull_request: workflow_call: inputs: channel: @@ -14,6 +13,11 @@ on: job_to_run: required: true type: string + is_pull_request: + description: "Is this a PR?" + default: false + type: boolean + required: true workflow_dispatch: inputs: win_installer_link: @@ -37,7 +41,7 @@ env: jobs: Smoke-Windows: - if: ${{ inputs.job_to_run == 'Smoke-Windows' || github.event_name == 'pull_request' || inputs.win_installer_link }} + if: ${{ inputs.job_to_run == 'Smoke-Windows' || inputs.win_installer_link }} runs-on: windows-latest steps: - name: Create app token @@ -63,7 +67,7 @@ jobs: New-item -Name .env -Value $env_contents -ItemType File -Force Write-Host "Running smoke tests on supplied executable" - name: Set Environment (Scheduled Beta) - if: ${{ inputs.job_to_run == 'Smoke-Windows' }} + if: ${{ inputs.job_to_run == 'Smoke-Windows' && inputs.is_pull_request == false}} run: | $env_contents = @" TESTRAIL_REPORT='true' @@ -169,7 +173,7 @@ jobs: exit $? echo "Triggered by event: ${{ github.event_name }}" - name: Set Environment (Scheduled Beta) - if: ${{ inputs.job_to_run == 'Smoke-MacOS' }} + if: ${{ inputs.job_to_run == 'Smoke-MacOS' && inputs.is_pull_request == false}} run: | echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV"; echo "Running report for most recent Beta on MacOS"; diff --git a/choose_test_channel.py b/choose_test_channel.py new file mode 100644 index 000000000..a0449b33e --- /dev/null +++ b/choose_test_channel.py @@ -0,0 +1,61 @@ +import os +import re +import sys +from subprocess import check_output + +ALL_CHANNELS = ["smoke", "l10n"] +SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) +SLASH = "/" if "/" in SCRIPT_DIR else "\\" + +file_subsets = { + "smoke": ["modules/data", "modules/page", "modules/browser", "tests/"], + "l10n": ["l10n_CM/"], +} + +l10n_module_patterns = [ + r"modules/page_object_prefs\.py", + r"modules/data/about_prefs\.components\.json", + r"modules/page_object_autofill\.py", + r"modules/data/address_fill\.components\.json", + r"modules/data/credit_card_fill\.components\.json", + r"modules/browser_object_autofill_popup\.py", + r"modules/data/autofill_popup\.components\.json", +] + +l10n_module_patterns = set( + [ + re.compile(val.replace("/", r"\\")) if SLASH == "\\" else re.compile(val) + for val in l10n_module_patterns + ] +) + +check_output(["git", "fetch", "--quiet", "--depth=1", "origin", "main"]) + +committed_files = ( + check_output(["git", "--no-pager", "diff", "--name-only", "origin/main"]) + .decode() + .replace("/", SLASH) + .splitlines() +) +main_conftest = "conftest.py" +base_page = os.path.join("modules", "page_base.py") + +channels = [] + +if main_conftest in committed_files or base_page in committed_files: + print(ALL_CHANNELS) + sys.exit() + +for f in committed_files: + if any([r.match(f) for r in l10n_module_patterns]): + sys.exit() + + for test_channel in file_subsets: + for subset in file_subsets[test_channel]: + print(f, test_channel, subset) + if subset in f and test_channel not in channels: + channels.append(test_channel) + +if not channels: + channels = ["smoke"] +print(channels) diff --git a/l10n_CM/run_l10n.py b/l10n_CM/run_l10n.py index c56afd609..404045aa8 100644 --- a/l10n_CM/run_l10n.py +++ b/l10n_CM/run_l10n.py @@ -34,7 +34,7 @@ "cdiscount", "aldoshoes", "canadatire", - "artsper" + "artsper", } loaded_valid_sites = valid_l10n_mappings().keys() diff --git a/modules/testrail_integration.py b/modules/testrail_integration.py index b670b8ddc..665e6a2f9 100644 --- a/modules/testrail_integration.py +++ b/modules/testrail_integration.py @@ -392,7 +392,12 @@ def organize_l10n_entries( if not test_results[category].get(run_id): test_results[category][run_id] = [] test_results[category][run_id].append( - {"suite_id": suite_id, "site": site, "test_case": test_case, "duration": f"{duration}s"} + { + "suite_id": suite_id, + "site": site, + "test_case": test_case, + "duration": f"{duration}s", + } ) return test_results From 11dccab72182d6f8d91d5551f65b338fc6e8d427 Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Fri, 25 Jul 2025 15:06:40 -0700 Subject: [PATCH 02/14] fix channel script --- choose_test_channel.py | 1 - 1 file changed, 1 deletion(-) diff --git a/choose_test_channel.py b/choose_test_channel.py index a0449b33e..598e92e8d 100644 --- a/choose_test_channel.py +++ b/choose_test_channel.py @@ -52,7 +52,6 @@ for test_channel in file_subsets: for subset in file_subsets[test_channel]: - print(f, test_channel, subset) if subset in f and test_channel not in channels: channels.append(test_channel) From 2f2e681d57e9dd911b8a577332c58b16a47240d7 Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Fri, 25 Jul 2025 15:13:12 -0700 Subject: [PATCH 03/14] fix chain of needs --- .github/workflows/ci-dispatch.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-dispatch.yml b/.github/workflows/ci-dispatch.yml index 963ce7784..9282016d1 100644 --- a/.github/workflows/ci-dispatch.yml +++ b/.github/workflows/ci-dispatch.yml @@ -4,6 +4,8 @@ name: DTE Automation Dispatch run-name: CI tests kicked off by ${{ github.actor }} on: pull_request: +permissions: + contents: "write" jobs: Select-Channels: @@ -14,14 +16,12 @@ jobs: - name: Select test channels id: dispatch run: | - pip3 install 'pipenv==2023.11.15'; - pipenv install - echo channels=$(pipenv run python choose_test_channel.py) >> "$GITHUB_OUTPUT" + echo channels=$(python3 choose_test_channel.py) >> "$GITHUB_OUTPUT" Run-Win-Smoke: needs: Select-Channels - if: contains(fromJSON(needs.dispatch.outputs.channels), 'smoke') + if: contains(fromJSON(needs.Select-Channels.outputs.channels_dispatch), 'smoke') uses: ./.github/workflows/smoke.yml with: job_to_run: Smoke-Windows From 83a9ff51a07b70052183025baeb2e75d600540ca Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Fri, 25 Jul 2025 15:14:11 -0700 Subject: [PATCH 04/14] fix chain of needs --- .github/workflows/ci-dispatch.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-dispatch.yml b/.github/workflows/ci-dispatch.yml index 9282016d1..7828013ed 100644 --- a/.github/workflows/ci-dispatch.yml +++ b/.github/workflows/ci-dispatch.yml @@ -30,7 +30,7 @@ jobs: Run-Mac-Smoke: needs: Select-Channels - if: contains(fromJSON(needs.dispatch.outputs.channels), 'smoke') + if: contains(fromJSON(needs.Select-Channels.outputs.channels_dispatch), 'smoke') uses: ./.github/workflows/smoke.yml with: job_to_run: Smoke-MacOS @@ -39,7 +39,7 @@ jobs: Run-Win-L10n: needs: Select-Channels - if: contains(fromJSON(needs.dispatch.outputs.channels), 'l10n') + if: contains(fromJSON(needs.Select-Channels.outputs.channels_dispatch), 'l10n') uses: ./.github/workflows/l10n.yml with: job_to_run: L10n-Windows @@ -48,7 +48,7 @@ jobs: Run-Mac-L10n: needs: Select-Channels - if: contains(fromJSON(needs.dispatch.outputs.channels), 'l10n') + if: contains(fromJSON(needs.Select-Channels.outputs.channels_dispatch), 'l10n') uses: ./.github/workflows/l10n.yml with: job_to_run: L10n-MacOS @@ -57,7 +57,7 @@ jobs: Run-Linux-L10n: needs: Select-Channels - if: contains(fromJSON(needs.dispatch.outputs.channels), 'l10n') + if: contains(fromJSON(needs.Select-Channels.outputs.channels_dispatch), 'l10n') uses: ./.github/workflows/l10n.yml with: job_to_run: L10n-Linux From 515304538c6fe21457f174fa25e494aae9293ec2 Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Fri, 25 Jul 2025 15:18:39 -0700 Subject: [PATCH 05/14] fix chain of needs --- .github/workflows/ci-dispatch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-dispatch.yml b/.github/workflows/ci-dispatch.yml index 7828013ed..4dda7f7f2 100644 --- a/.github/workflows/ci-dispatch.yml +++ b/.github/workflows/ci-dispatch.yml @@ -16,6 +16,7 @@ jobs: - name: Select test channels id: dispatch run: | + python3 choose_test_channel.py echo channels=$(python3 choose_test_channel.py) >> "$GITHUB_OUTPUT" From 3ecd325c4bb4bbf4a09f9194ae08db681e413db1 Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Fri, 25 Jul 2025 15:24:14 -0700 Subject: [PATCH 06/14] fix chain of needs --- .github/workflows/ci-dispatch.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-dispatch.yml b/.github/workflows/ci-dispatch.yml index 4dda7f7f2..b2cfeca5f 100644 --- a/.github/workflows/ci-dispatch.yml +++ b/.github/workflows/ci-dispatch.yml @@ -10,6 +10,8 @@ permissions: jobs: Select-Channels: runs-on: ubuntu-latest + outputs: + channels: ${{ steps.dispatch.outputs.channels }} steps: - name: Checkout repository uses: actions/checkout@v4 @@ -22,7 +24,7 @@ jobs: Run-Win-Smoke: needs: Select-Channels - if: contains(fromJSON(needs.Select-Channels.outputs.channels_dispatch), 'smoke') + if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke') uses: ./.github/workflows/smoke.yml with: job_to_run: Smoke-Windows @@ -31,7 +33,7 @@ jobs: Run-Mac-Smoke: needs: Select-Channels - if: contains(fromJSON(needs.Select-Channels.outputs.channels_dispatch), 'smoke') + if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke') uses: ./.github/workflows/smoke.yml with: job_to_run: Smoke-MacOS @@ -40,7 +42,7 @@ jobs: Run-Win-L10n: needs: Select-Channels - if: contains(fromJSON(needs.Select-Channels.outputs.channels_dispatch), 'l10n') + if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n') uses: ./.github/workflows/l10n.yml with: job_to_run: L10n-Windows @@ -49,7 +51,7 @@ jobs: Run-Mac-L10n: needs: Select-Channels - if: contains(fromJSON(needs.Select-Channels.outputs.channels_dispatch), 'l10n') + if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n') uses: ./.github/workflows/l10n.yml with: job_to_run: L10n-MacOS @@ -58,7 +60,7 @@ jobs: Run-Linux-L10n: needs: Select-Channels - if: contains(fromJSON(needs.Select-Channels.outputs.channels_dispatch), 'l10n') + if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n') uses: ./.github/workflows/l10n.yml with: job_to_run: L10n-Linux From b88f8a56d95bf91ae6724286f2442c59cdb7221f Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Fri, 25 Jul 2025 17:26:15 -0700 Subject: [PATCH 07/14] fix chain of needs --- .github/workflows/ci-dispatch.yml | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci-dispatch.yml b/.github/workflows/ci-dispatch.yml index b2cfeca5f..3036a2c0c 100644 --- a/.github/workflows/ci-dispatch.yml +++ b/.github/workflows/ci-dispatch.yml @@ -22,7 +22,7 @@ jobs: echo channels=$(python3 choose_test_channel.py) >> "$GITHUB_OUTPUT" - Run-Win-Smoke: + Run-Smoke: needs: Select-Channels if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke') uses: ./.github/workflows/smoke.yml @@ -31,16 +31,7 @@ jobs: is_pull_request: true secrets: inherit - Run-Mac-Smoke: - needs: Select-Channels - if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke') - uses: ./.github/workflows/smoke.yml - with: - job_to_run: Smoke-MacOS - is_pull_request: true - secrets: inherit - - Run-Win-L10n: + Run-L10n: needs: Select-Channels if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n') uses: ./.github/workflows/l10n.yml @@ -48,21 +39,3 @@ jobs: job_to_run: L10n-Windows is_pull_request: true secrets: inherit - - Run-Mac-L10n: - needs: Select-Channels - if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n') - uses: ./.github/workflows/l10n.yml - with: - job_to_run: L10n-MacOS - is_pull_request: true - secrets: inherit - - Run-Linux-L10n: - needs: Select-Channels - if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n') - uses: ./.github/workflows/l10n.yml - with: - job_to_run: L10n-Linux - is_pull_request: true - secrets: inherit From 2eac5a7e0248b4d36feeefb75e763bdf49471707 Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Fri, 25 Jul 2025 17:35:40 -0700 Subject: [PATCH 08/14] fix workflow selection --- .github/workflows/ci-dispatch.yml | 31 +++++++++++++++++++++++++++++-- .github/workflows/l10n.yml | 10 +++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-dispatch.yml b/.github/workflows/ci-dispatch.yml index 3036a2c0c..e0e65782c 100644 --- a/.github/workflows/ci-dispatch.yml +++ b/.github/workflows/ci-dispatch.yml @@ -22,7 +22,7 @@ jobs: echo channels=$(python3 choose_test_channel.py) >> "$GITHUB_OUTPUT" - Run-Smoke: + Run-Smoke-Win: needs: Select-Channels if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke') uses: ./.github/workflows/smoke.yml @@ -31,7 +31,16 @@ jobs: is_pull_request: true secrets: inherit - Run-L10n: + Run-Smoke-Mac: + needs: Select-Channels + if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke') + uses: ./.github/workflows/smoke.yml + with: + job_to_run: Smoke-MacOS + is_pull_request: true + secrets: inherit + + Run-L10n-Win: needs: Select-Channels if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n') uses: ./.github/workflows/l10n.yml @@ -39,3 +48,21 @@ jobs: job_to_run: L10n-Windows is_pull_request: true secrets: inherit + + Run-L10n-Mac: + needs: Select-Channels + if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n') + uses: ./.github/workflows/l10n.yml + with: + job_to_run: L10n-MacOS + is_pull_request: true + secrets: inherit + + Run-L10n-Linux: + needs: Select-Channels + if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n') + uses: ./.github/workflows/l10n.yml + with: + job_to_run: L10n-Linux + is_pull_request: true + secrets: inherit diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml index e7bc7be5a..6f12c67d0 100644 --- a/.github/workflows/l10n.yml +++ b/.github/workflows/l10n.yml @@ -42,7 +42,7 @@ env: jobs: L10N-MacOS: - if: ${{ inputs.job_to_run == 'L10N-MacOS' || github.event_name == 'pull_request' || inputs.mac_installer_link }} + if: ${{ inputs.job_to_run == 'L10N-MacOS' || inputs.mac_installer_link }} runs-on: macos-latest steps: - name: Create app token @@ -127,7 +127,7 @@ jobs: name: artifacts-mac path: artifacts-mac L10N-Linux: - if: ${{ inputs.job_to_run == 'L10N-Linux' || github.event_name == 'pull_request' || inputs.linux_tarball_link }} + if: ${{ inputs.job_to_run == 'L10N-Linux' || inputs.linux_tarball_link }} runs-on: ubuntu-latest steps: - name: Create app token @@ -204,13 +204,13 @@ jobs: fi exit $SCRIPT_EXIT_CODE; - name: Upload artifacts - if: ${{ always() && github.event_name == 'pull_request' }} + if: ${{ always() && inputs.is_pull_request == true }} uses: actions/upload-artifact@v4 with: name: artifacts-linux path: artifacts-linux L10N-Windows: - if: ${{ inputs.job_to_run == 'L10N-Windows' || github.event_name == 'pull_request' || inputs.win_installer_link }} + if: ${{ inputs.job_to_run == 'L10N-Windows' || inputs.win_installer_link }} runs-on: windows-latest steps: - name: Create app token @@ -344,7 +344,7 @@ jobs: } exit $env:SCRIPT_EXIT_CODE - name: Upload artifacts - if: ${{ always() && github.event_name == 'pull_request' }} + if: ${{ always() && inputs.is_pull_request == true }} uses: actions/upload-artifact@v4 with: name: artifacts-win From 706716a7adc852b77cc0048061db4f02583e561c Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Mon, 28 Jul 2025 13:33:00 -0700 Subject: [PATCH 09/14] fix dispatch script --- choose_test_channel.py | 1 + 1 file changed, 1 insertion(+) diff --git a/choose_test_channel.py b/choose_test_channel.py index 598e92e8d..06198725d 100644 --- a/choose_test_channel.py +++ b/choose_test_channel.py @@ -48,6 +48,7 @@ for f in committed_files: if any([r.match(f) for r in l10n_module_patterns]): + print(ALL_CHANNELS) sys.exit() for test_channel in file_subsets: From 8d5f2ea6fae762437dbda618c7432b0102608bd4 Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Mon, 28 Jul 2025 13:58:56 -0700 Subject: [PATCH 10/14] skip linux smoke if not called for --- .github/workflows/smoke.yml | 2 +- taskcluster/kinds/run-smoke-tests/kind.yml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index c551111b8..0957cabfd 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -150,7 +150,7 @@ jobs: name: artifacts-win path: artifacts-win Smoke-MacOS: - if: ${{ inputs.job_to_run == 'Smoke-MacOS' || github.event_name == 'pull_request' || inputs.mac_installer_link }} + if: ${{ inputs.job_to_run == 'Smoke-MacOS' || inputs.mac_installer_link }} runs-on: macos-latest steps: - name: Create app token diff --git a/taskcluster/kinds/run-smoke-tests/kind.yml b/taskcluster/kinds/run-smoke-tests/kind.yml index aa99c7e05..1ee5cb9f0 100644 --- a/taskcluster/kinds/run-smoke-tests/kind.yml +++ b/taskcluster/kinds/run-smoke-tests/kind.yml @@ -3,8 +3,8 @@ transforms: - taskgraph.transforms.notify:transforms task-defaults: - label: "Smoke Tests" - description: "Runs Smoke Tests and Notifies Slack" + label: "CI Smoke Tests" + description: "Runs CI Smoke Tests and Notifies Slack" worker-type: t-linux-wayland worker: taskcluster-proxy: true @@ -34,6 +34,7 @@ tasks: ./collect_executables.sh; ./firefox/firefox --version; . ./keyring-unlock.sh + if [[ ! $(python3 choose_test_channel.py) =~ "smoke" ]] then exit 0; fi pipenv run python3 choose_ci_set.py pipenv run pytest --fx-executable ./firefox/firefox -n 4 $(cat selected_tests) export FAILURE=${?} From a266c57a917e8e04a075ee7bb2ddb52fa6ee30aa Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Mon, 28 Jul 2025 15:02:14 -0700 Subject: [PATCH 11/14] skip linux smoke if not called for --- taskcluster/kinds/run-smoke-tests/kind.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskcluster/kinds/run-smoke-tests/kind.yml b/taskcluster/kinds/run-smoke-tests/kind.yml index 1ee5cb9f0..f11bfb27c 100644 --- a/taskcluster/kinds/run-smoke-tests/kind.yml +++ b/taskcluster/kinds/run-smoke-tests/kind.yml @@ -34,7 +34,7 @@ tasks: ./collect_executables.sh; ./firefox/firefox --version; . ./keyring-unlock.sh - if [[ ! $(python3 choose_test_channel.py) =~ "smoke" ]] then exit 0; fi + if [[ ! $(python3 choose_test_channel.py) =~ "smoke" ]]; then exit 0; fi pipenv run python3 choose_ci_set.py pipenv run pytest --fx-executable ./firefox/firefox -n 4 $(cat selected_tests) export FAILURE=${?} From 5dc78dd31a59dd540f43828e2fda16a1f30e9dc1 Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Mon, 28 Jul 2025 16:51:18 -0700 Subject: [PATCH 12/14] try l10n flow --- l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py b/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py index f33754cbf..32af0254f 100644 --- a/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py +++ b/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py @@ -5,6 +5,8 @@ from modules.classes.autofill_base import AutofillAddressBase from modules.page_object_autofill import AddressFill +# test comment + @pytest.fixture() def test_case(): From e4793ed828fc1967c08e8d27260a25392be1eddf Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Mon, 28 Jul 2025 18:49:30 -0700 Subject: [PATCH 13/14] fix artifact collision --- .github/workflows/l10n.yml | 6 +++--- .github/workflows/smoke.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml index 6f12c67d0..fd19322a5 100644 --- a/.github/workflows/l10n.yml +++ b/.github/workflows/l10n.yml @@ -371,17 +371,17 @@ jobs: - name: Download Windows artifact uses: actions/download-artifact@v4 with: - name: artifacts-win + name: artifacts-win-l10n path: artifacts-win - name: Download Linux artifact uses: actions/download-artifact@v4 with: - name: artifacts-linux + name: artifacts-linux-l10n path: artifacts-linux - name: Download MacOS artifact uses: actions/download-artifact@v4 with: - name: artifacts-mac + name: artifacts-mac-l10n path: artifacts-mac - name: List downloaded Windows files run: ls artifacts-win/ diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index 0957cabfd..7a3d44055 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -147,7 +147,7 @@ jobs: if: ${{ always() && github.event_name == 'pull_request' }} uses: actions/upload-artifact@v4 with: - name: artifacts-win + name: artifacts-win-smoke path: artifacts-win Smoke-MacOS: if: ${{ inputs.job_to_run == 'Smoke-MacOS' || inputs.mac_installer_link }} @@ -221,7 +221,7 @@ jobs: if: ${{ always() && github.event_name == 'pull_request' }} uses: actions/upload-artifact@v4 with: - name: artifacts-mac + name: artifacts-mac-smoke path: artifacts-mac Smoke-Linux: if: ${{ inputs.linux_tarball_link }} From 69e5f13fc8eb675a6425126125f96980d9f18d95 Mon Sep 17 00:00:00 2001 From: Ben Chatterton Date: Mon, 28 Jul 2025 19:12:28 -0700 Subject: [PATCH 14/14] try smaller l10n mapping change --- l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py | 2 -- l10n_CM/sites/canadatire/CA/canadatire_ad.html | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py b/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py index 32af0254f..f33754cbf 100644 --- a/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py +++ b/l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py @@ -5,8 +5,6 @@ from modules.classes.autofill_base import AutofillAddressBase from modules.page_object_autofill import AddressFill -# test comment - @pytest.fixture() def test_case(): diff --git a/l10n_CM/sites/canadatire/CA/canadatire_ad.html b/l10n_CM/sites/canadatire/CA/canadatire_ad.html index ed0dc24e7..64348d01f 100644 --- a/l10n_CM/sites/canadatire/CA/canadatire_ad.html +++ b/l10n_CM/sites/canadatire/CA/canadatire_ad.html @@ -1,4 +1,4 @@ -Account Settings | Canadian Tire-Account Settings | Canadian Tire
ConsentLeg.Interest
label
label
label
label
\ No newline at end of file + C402.765,25.895,404.093,19.231,400.858,11.427z">
ConsentLeg.Interest
label
label
label
label