From 9e44964c5bbdfba4e2c8645a86534c5f80b657ed Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Date: Mon, 16 Dec 2024 11:13:23 +0100 Subject: [PATCH 1/6] Split test using name filter regex Signed-off-by: Raul Sanchez-Mateos --- .github/workflows/nightly-windows-master.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-windows-master.yml b/.github/workflows/nightly-windows-master.yml index 75f3e0fd9d3..02d21b8ebea 100644 --- a/.github/workflows/nightly-windows-master.yml +++ b/.github/workflows/nightly-windows-master.yml @@ -16,10 +16,13 @@ jobs: cmake_build_type: - 'Debug' - 'RelWithDebInfo' + test_filter: + - 'blackbox' + - 'unittest' uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@master with: - label: 'nightly-sec-${{ matrix.security }}-windows-ci-master' + label: nightly-sec-${{ matrix.security }}-${{ matrix.cmake_build_type }}-${{ matrix.test_filter }}-windows-ci-master cmake-config: ${{ matrix.cmake_build_type }} cmake-args: "-DSECURITY=${{ matrix.security }}" - ctest-args: "-LE xfail" + ctest-args: -LE xfail ${{ matrix.test_filter == 'blackbox' && '-R "BlackboxTests|example_tests"' || matrix.test_filter == 'unittest' && '-E "BlackboxTests|example_tests"' }} fastdds_branch: 'master' From c71018a8c59f91106b536b4c36ae9422e4b2445a Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Thu, 19 Dec 2024 08:05:47 +0100 Subject: [PATCH 2/6] Run unit tests in parallel Signed-off-by: Miguel Company --- .github/workflows/nightly-windows-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly-windows-master.yml b/.github/workflows/nightly-windows-master.yml index 02d21b8ebea..d9d8e2513e7 100644 --- a/.github/workflows/nightly-windows-master.yml +++ b/.github/workflows/nightly-windows-master.yml @@ -24,5 +24,5 @@ jobs: label: nightly-sec-${{ matrix.security }}-${{ matrix.cmake_build_type }}-${{ matrix.test_filter }}-windows-ci-master cmake-config: ${{ matrix.cmake_build_type }} cmake-args: "-DSECURITY=${{ matrix.security }}" - ctest-args: -LE xfail ${{ matrix.test_filter == 'blackbox' && '-R "BlackboxTests|example_tests"' || matrix.test_filter == 'unittest' && '-E "BlackboxTests|example_tests"' }} + ctest-args: -LE xfail ${{ matrix.test_filter == 'blackbox' && '-R "BlackboxTests|example_tests"' || matrix.test_filter == 'unittest' && '-E "BlackboxTests|example_tests" -j 4' }} fastdds_branch: 'master' From 306302e9661f182c9324f973a4a4a5ca27ce0cff Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 8 Jan 2025 16:15:30 +0100 Subject: [PATCH 3/6] Use matrix variable to define test expresion Signed-off-by: Miguel Company --- .github/workflows/nightly-windows-master.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-windows-master.yml b/.github/workflows/nightly-windows-master.yml index d9d8e2513e7..86230c033fd 100644 --- a/.github/workflows/nightly-windows-master.yml +++ b/.github/workflows/nightly-windows-master.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: schedule: - cron: '0 22 * * *' # At 22:00 GMT - + jobs: nightly-windows-ci-master: strategy: @@ -19,10 +19,12 @@ jobs: test_filter: - 'blackbox' - 'unittest' + filter_expression: + - 'BlackboxTests|example_tests' uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@master with: label: nightly-sec-${{ matrix.security }}-${{ matrix.cmake_build_type }}-${{ matrix.test_filter }}-windows-ci-master cmake-config: ${{ matrix.cmake_build_type }} cmake-args: "-DSECURITY=${{ matrix.security }}" - ctest-args: -LE xfail ${{ matrix.test_filter == 'blackbox' && '-R "BlackboxTests|example_tests"' || matrix.test_filter == 'unittest' && '-E "BlackboxTests|example_tests" -j 4' }} + ctest-args: -LE xfail ${{ matrix.test_filter == 'blackbox' && format('-R "{0}"', matrix.filter_expression) || format('-E "{0}" -j 4', matrix.filter_expression) }} fastdds_branch: 'master' From 53c627a1a860c07001c8ae8aa0983a9372d475a6 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 8 Jan 2025 17:06:11 +0100 Subject: [PATCH 4/6] Add more tests to sequential job Signed-off-by: Miguel Company --- .github/workflows/nightly-windows-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly-windows-master.yml b/.github/workflows/nightly-windows-master.yml index 86230c033fd..0b95edb5776 100644 --- a/.github/workflows/nightly-windows-master.yml +++ b/.github/workflows/nightly-windows-master.yml @@ -20,7 +20,7 @@ jobs: - 'blackbox' - 'unittest' filter_expression: - - 'BlackboxTests|example_tests' + - 'BlackboxTests|example_tests|ParticipantTests|SecureDiscoverServer' uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@master with: label: nightly-sec-${{ matrix.security }}-${{ matrix.cmake_build_type }}-${{ matrix.test_filter }}-windows-ci-master From 8e69b349db384a59b6bf975fd5325ec8c2f2fa77 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Thu, 9 Jan 2025 10:33:55 +0100 Subject: [PATCH 5/6] Customize job name Signed-off-by: Miguel Company --- .github/workflows/nightly-windows-master.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly-windows-master.yml b/.github/workflows/nightly-windows-master.yml index 0b95edb5776..ea0bd27eac1 100644 --- a/.github/workflows/nightly-windows-master.yml +++ b/.github/workflows/nightly-windows-master.yml @@ -4,9 +4,10 @@ on: workflow_dispatch: schedule: - cron: '0 22 * * *' # At 22:00 GMT - + jobs: nightly-windows-ci-master: + name: nightly-windows-ci-master (SEC=${{ matrix.security }}, ${{ matrix.cmake_build_type }}, ${{ matrix.test_filter }}) strategy: fail-fast: false matrix: From f65e8933dde6ec44e00efaa0639a6e978548eda1 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 15 Jan 2025 14:47:49 +0100 Subject: [PATCH 6/6] Reorder matrix Signed-off-by: Miguel Company --- .github/workflows/nightly-windows-master.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly-windows-master.yml b/.github/workflows/nightly-windows-master.yml index ea0bd27eac1..2480b4d73d9 100644 --- a/.github/workflows/nightly-windows-master.yml +++ b/.github/workflows/nightly-windows-master.yml @@ -7,16 +7,16 @@ on: jobs: nightly-windows-ci-master: - name: nightly-windows-ci-master (SEC=${{ matrix.security }}, ${{ matrix.cmake_build_type }}, ${{ matrix.test_filter }}) + name: nightly-windows-ci-master (${{ matrix.cmake_build_type }}, SEC=${{ matrix.security }}, ${{ matrix.test_filter }}) strategy: fail-fast: false matrix: + cmake_build_type: + - 'RelWithDebInfo' + - 'Debug' security: - 'ON' - 'OFF' - cmake_build_type: - - 'Debug' - - 'RelWithDebInfo' test_filter: - 'blackbox' - 'unittest'