Merge pull request #477 from mozilla/Pat/update_workflow_logic

Updated workflow

Author: whlpatricia

.github/workflows/check-beta.yml

@@ -12,7 +12,8 @@ jobs:
   Check-Beta-Version:
     runs-on: ubuntu-latest
     outputs:
-      reportable: ${{ steps.reportable.outputs.test }}
+      win_reportable: ${{ steps.reportable.outputs.win }}
+      mac_reportable: ${{ steps.reportable.outputs.mac }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -26,9 +27,21 @@ jobs:
         run: |
           pip3 install 'pipenv==2023.11.15';
           pipenv install
-          echo test=$(pipenv run python -c 'from modules import testrail_integration as tri; print(tri.reportable())') >> "$GITHUB_OUTPUT"
-  Run-Smoke-Tests:
+          echo win=$(pipenv run python -c 'from modules import testrail_integration as tri; print(tri.reportable("Windows"))') >> "$GITHUB_OUTPUT"
+          echo mac=$(pipenv run python -c 'from modules import testrail_integration as tri; print(tri.reportable("Darwin"))') >> "$GITHUB_OUTPUT"
+  Run-Win-Smoke: 
     needs: Check-Beta-Version
-    if: ${{ needs.Check-Beta-Version.outputs.reportable == 'True' }}
+    if: ${{ needs.Check-Beta-Version.outputs.win_reportable == 'True' }}
     uses: ./.github/workflows/smoke.yml
+    with:
+      job_to_run: Smoke-Windows
     secrets: inherit
+
+  Run-Mac-Smoke: 
+    needs: Check-Beta-Version
+    if: ${{ needs.Check-Beta-Version.outputs.mac_reportable == 'True' }}
+    uses: ./.github/workflows/smoke.yml
+    with:
+      job_to_run: Smoke-MacOS
+    secrets: inherit
+            

.github/workflows/smoke.yml

@@ -5,6 +5,10 @@ run-name: ${{ github.actor }} is running smoke tests
 on:
   pull_request:
   workflow_call:
+    inputs:
+      job_to_run: 
+        required: true
+        type: string
 env:
   TESTRAIL_BASE_URL: ${{ secrets.TESTRAIL_BASE_URL }}
   TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
@@ -30,7 +34,7 @@ jobs:
         with:
           python-version: "3.11"
       - name: Set Environment
-        if: ${{ github.event_name == 'schedule' }}
+        if: ${{ inputs.job_to_run == 'Smoke-Windows' }}
         run: |
           $env_contents = @"
           TESTRAIL_REPORT='true'
@@ -128,7 +132,7 @@ jobs:
           exit $?
           echo "Triggered by event: ${{ github.event_name }}"
       - name: Set Environment
-        if: ${{ github.event_name == 'schedule' }}
+        if: ${{ inputs.job_to_run == 'Smoke-MacOS' }}
         run: |
           echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV";
           echo "Running report for most recent Beta on MacOS";

modules/testrail_integration.py

@@ -63,7 +63,7 @@ def tc_reportable():
         sys.exit(100)
 
 
-def reportable():
+def reportable(platform_to_test=None):
     """Return true if we should report to TestRail"""
     import platform
 
@@ -118,6 +118,8 @@ def reportable():
         )
         return True
 
+    if platform_to_test:
+        sys_platform = platform_to_test
     platform = "MacOS" if sys_platform == "Darwin" else sys_platform
 
     plan_entries = this_plan.get("entries")