From 43c5d5d1026a0fbcd889539086c461d1a8172a6a Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 19 Sep 2023 11:05:45 -0700 Subject: [PATCH 1/2] Add a matrix label to FTL test runs, to make sorting them easier. --- .github/workflows/integration_tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 22daa2be7a..3ceb77de92 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -1046,6 +1046,7 @@ jobs: test_devices: ${{ steps.device-info.outputs.device }} max_attempts: 3 validator: ${GITHUB_WORKSPACE}/scripts/gha/integration_testing/ftl_gha_validator.py + additional_flags: '--client-details matrixLabel=android-${{ github.run_id }}-${{ matrix.build_os }}-${{ matrix.android_device }}' - name: Read FTL Test Result if: ${{ steps.device-info.outputs.device_type == 'ftl' && !cancelled() }} shell: bash @@ -1189,6 +1190,7 @@ jobs: test_devices: ${{ steps.device-info.outputs.device }} max_attempts: 3 validator: ${GITHUB_WORKSPACE}/scripts/gha/integration_testing/ftl_gha_validator.py + additional_flags: '--client-details matrixLabel=ios-${{ github.run_id }}-${{ matrix.build_os }}-${{ matrix.android_device }}' - name: Read FTL Test Result if: ${{ steps.device-info.outputs.device_type == 'ftl' && !cancelled() }} shell: bash From 6a90506d5484aaf07261b58283d37c637d4e7bd0 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Tue, 19 Sep 2023 12:40:42 -0700 Subject: [PATCH 2/2] Fix label for iOS --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 3ceb77de92..21435fca16 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -1190,7 +1190,7 @@ jobs: test_devices: ${{ steps.device-info.outputs.device }} max_attempts: 3 validator: ${GITHUB_WORKSPACE}/scripts/gha/integration_testing/ftl_gha_validator.py - additional_flags: '--client-details matrixLabel=ios-${{ github.run_id }}-${{ matrix.build_os }}-${{ matrix.android_device }}' + additional_flags: '--client-details matrixLabel=ios-${{ github.run_id }}-${{ matrix.build_os }}-${{ matrix.ios_device }}' - name: Read FTL Test Result if: ${{ steps.device-info.outputs.device_type == 'ftl' && !cancelled() }} shell: bash