Merge branch 'main' into anca/cm-de-thomann

Author: soncuteanca

.github/workflows/check-beta.yml

@@ -47,4 +47,4 @@ jobs:
     uses: ./.github/workflows/smoke.yml
     with:
       job_to_run: Smoke-MacOS
-    secrets: inherit
+    secrets: inherit

.github/workflows/ci-dispatch.yml

@@ -0,0 +1,68 @@
+---
+name: DTE Automation Dispatch
+
+run-name: CI tests kicked off by ${{ github.actor }}
+on:
+  pull_request:
+permissions:
+  contents: "write"
+
+jobs:
+  Select-Channels:
+    runs-on: ubuntu-latest
+    outputs:
+      channels: ${{ steps.dispatch.outputs.channels }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Select test channels
+        id: dispatch
+        run: |
+          python3 choose_test_channel.py
+          echo channels=$(python3 choose_test_channel.py) >> "$GITHUB_OUTPUT"
+
+
+  Run-Smoke-Win:
+    needs: Select-Channels
+    if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke')
+    uses: ./.github/workflows/smoke.yml
+    with:
+      job_to_run: Smoke-Windows
+      is_pull_request: true
+    secrets: inherit
+
+  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
+    with:
+      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

.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,10 @@ on:
       job_to_run:
         required: true
         type: string
+      is_pull_request:
+        description: "Is this a PR?"
+        default: false
+        type: boolean
   workflow_dispatch:
     inputs:
       win_installer_link:
@@ -38,7 +41,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
@@ -56,7 +59,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";
@@ -123,7 +126,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
@@ -141,7 +144,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";
@@ -200,13 +203,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
@@ -232,7 +235,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'
@@ -340,7 +343,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
@@ -367,17 +370,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/

.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,10 @@ on:
       job_to_run:
         required: true
         type: string
+      is_pull_request:
+        description: "Is this a PR?"
+        default: false
+        type: boolean
   workflow_dispatch:
     inputs:
       win_installer_link:
@@ -37,7 +40,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 +66,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'
@@ -112,7 +115,7 @@ jobs:
           $env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
           Start-Process -FilePath $env:FX_EXECUTABLE -ArgumentList "--version" -Wait -NoNewWindow
           pipenv run python choose_ci_set.py
-          pipenv run pytest -n 4 $(cat selected_tests)
+          pipenv run pytest $(cat selected_tests)
           $env:TEST_EXIT_CODE = $LASTEXITCODE
           mv artifacts artifacts-win || true
           exit $env:TEST_EXIT_CODE
@@ -143,10 +146,10 @@ 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' || 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
@@ -169,7 +172,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";
@@ -199,7 +202,7 @@ jobs:
         run: |
           "$FX_EXECUTABLE" --version
           pipenv run python choose_ci_set.py
-          pipenv run pytest --fx-executable="$FX_EXECUTABLE" -n 4 $(cat selected_tests) || TEST_EXIT_CODE=$?
+          pipenv run pytest --fx-executable="$FX_EXECUTABLE"  $(cat selected_tests) || TEST_EXIT_CODE=$?
           mv artifacts artifacts-mac || true
           exit $TEST_EXIT_CODE
       - name: Run Smoke Tests in MacOS (Headed)
@@ -217,7 +220,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 }}
@@ -268,7 +271,7 @@ jobs:
           "$FX_EXECUTABLE" --version;
           pipenv run python choose_ci_set.py;
           Xvfb :99 -screen 0 '1600x1200x24' > artifacts/xvfb.log &
-          DISPLAY=:99 pipenv run pytest --fx-executable="$FX_EXECUTABLE" -n 4 $(cat selected_tests) || TEST_EXIT_CODE=$?
+          DISPLAY=:99 pipenv run pytest --fx-executable="$FX_EXECUTABLE"  $(cat selected_tests) || TEST_EXIT_CODE=$?
           exit $TEST_EXIT_CODE
       - name: Run Smoke Tests in Ubuntu (Headed)
         if: steps.setup.conclusion == 'success' && always()

choose_l10n_ci_set.py

@@ -53,15 +53,18 @@ def process_changed_file(f, selected_mappings):
         selected_mappings: the selected mappings dictionary (updated in place).
     """
     split = f.split(SLASH)
-    if f.startswith("l10n_CM/sites/") or f.startswith("l10n_CM/constants/"):
+
+    if f.startswith(os.path.join("l10n_CM", "sites")) or f.startswith(
+        os.path.join("l10n_CM", "constants")
+    ):
         # if constants or sites are changed, add a single site/region mapping entry.
         site = split[2]
         region = split[3]
         region_path = os.path.join("l10n_CM", "region", f"{region}.json")
         # make sure the region mapping file exists before adding the mapping
         if os.path.exists(region_path):
             selected_mappings[site].add(region)
-    elif f.startswith("l10n_CM/region/"):
+    elif f.startswith(os.path.join("l10n_CM", "region")):
         # if a region file is changed, add the region to each site mapping.
         region = split[-1].split(".")[0]
         with open(f, "r+") as f:
@@ -81,6 +84,7 @@ def process_changed_file(f, selected_mappings):
     with open(OUTPUT_FILE, "w") as file:
         pass  # File is created or cleared
     l10n_mappings = valid_l10n_mappings()
+    sample_mappings = {k: v for k, v in l10n_mappings.items() if k.startswith("demo")}
     if os.environ.get("TESTRAIL_REPORT") or os.environ.get("MANUAL"):
         # Run all tests if this is a scheduled beta or a manual run
         add_selected_mappings(l10n_mappings)
@@ -127,24 +131,22 @@ def process_changed_file(f, selected_mappings):
     )
     main_conftest = "conftest.py"
     base_page = os.path.join("modules", "page_base.py")
-
+    selected_mappings = defaultdict(set)
     if main_conftest in committed_files or base_page in committed_files:
-        # Run all the tests for all mappings if main conftest or basepage changed
-        add_selected_mappings(l10n_mappings)
-        sys.exit(0)
+        # Run sample tests for all mappings if main conftest or basepage changed
+        selected_mappings |= sample_mappings
 
-    # Run all the tests for all mappings if any core l10n model, component, conftest, or tests are changed.
-    selected_mappings = defaultdict(set)
+    # Run sample tests for all mappings if any core l10n model, component, conftest, or tests are changed.
     for f in committed_files:
-        for re_val in re_set_all:
-            if re_val.match(f):
-                add_selected_mappings(l10n_mappings)
-                sys.exit(0)
         # check if constants, sites or region directory files were changed or added.
         # if so, add the site/region mappings.
         for re_val in re_set_select:
             if re_val.match(f):
                 process_changed_file(f, selected_mappings)
+        for re_val in re_set_all:
+            if re_val.match(f):
+                selected_mappings |= sample_mappings
+                break
 
     add_selected_mappings(selected_mappings)
     sys.exit(0)