workflows: Fix test selection logic

Signed-off-by: Jorgen Kvalvaag <jorgen.kvalvaag@nordicsemi.no>

Author: jorgenmk

.github/workflows/build.yml

@@ -201,7 +201,7 @@ jobs:
         working-directory: asset-tracker-template
 
       - name: Build patched thingy91x firmware
-        if: ${{ github.event_name != 'pull_request' }}
+        if: ${{ inputs.build_all }}
         uses: ./asset-tracker-template/.github/actions/build-step
         with:
           board: thingy91x/nrf9151/ns

.github/workflows/target-test.yml

@@ -12,6 +12,7 @@ on:
       pytest_marker:
         type: string
         required: false
+        default: -m "not slow"
       pytest_path:
         type: string
         required: false
@@ -55,14 +56,21 @@ jobs:
     steps:
       - id: set-matrix
         run: |
-          if [[ ${{ github.event_name == 'schedule' }} == "true" ]]; then
-              matrix='["thingy91x","nrf9151dk","ppk_thingy91x"]'
+          if [[ ${{ github.event_name == 'schedule' }} == true ]]; then
+            marker=''
+            matrix='["thingy91x","nrf9151dk","ppk_thingy91x"]'
+          elif [[ ${{ github.event_name == 'push' }} == true ]]; then
+            marker='-m "not slow"'
+            matrix='["thingy91x"]'
           else
+            marker='${{ inputs.pytest_marker }}'
             matrix=${{ inputs.devices }}
           fi
 
-          echo "Matrix as string: $matrix"
+          echo Matrix as string: $matrix
+          echo Pytest marker as string: $marker
           echo "device_matrix=$matrix" >> $GITHUB_OUTPUT
+          echo "pytest_marker=$marker" >> $GITHUB_OUTPUT
 
   target_test:
     # This will create multiple jobs, one for each target defined in the matrix
@@ -131,7 +139,7 @@ jobs:
               asset-tracker-template-${{ inputs.artifact_fw_version }}-debug-${{ vars.DUT_DEVICE_TYPE }}-nrf91.elf
 
       - name: Generate and Push RAM and FLASH Badges
-        if: ${{ matrix.device == 'thingy91x' && inputs.is_scheduled }}
+        if: ${{ matrix.device == 'thingy91x' && github.event_name == 'schedule' }}
         continue-on-error: true
         working-directory: asset-tracker-template
         env:
@@ -144,12 +152,12 @@ jobs:
           mkdir -p results
           if [[ '${{ matrix.device }}' == 'ppk_thingy91x' ]]; then
             # For PPK device, only run tests/test_ppk
-            pytest -v ${{ inputs.pytest_marker }} \
+            pytest -v ${{ needs.set-matrix.outputs.pytest_marker }} \
               --junit-xml=results/test-results.xml \
               --html=results/test-results.html --self-contained-html \
               tests/test_ppk
           else
-            pytest -v ${{ inputs.pytest_marker }} \
+            pytest -v ${{ needs.set-matrix.outputs.pytest_marker }} \
               --junit-xml=results/test-results.xml \
               --html=results/test-results.html --self-contained-html \
               --ignore=tests/test_ppk \

tests/on_target/tests/pytest.ini

@@ -1,4 +1,3 @@
 [pytest]
 markers =
     slow: marks tests as slow (deselect with '-m "not slow"')
-    mqtt: marks tests that require MQTT functionality

tests/on_target/tests/test_functional/test_mqtt.py

@@ -13,7 +13,6 @@
 
 logger = get_logger()
 
-@pytest.mark.mqtt
 @pytest.mark.slow
 def test_mqtt_firmware(dut_board, hex_file_mqtt):
     """Test the firmware with cloud MQTT module."""