Skip to content

Commit 48084a2

Browse files
committed
Refs #21327: TODO DROP THIS: add colcon test Dispatch argument
Signed-off-by: JesusPoderoso <[email protected]>
1 parent af05b40 commit 48084a2

File tree

7 files changed

+30
-8
lines changed

7 files changed

+30
-8
lines changed

.github/workflows/config/fastdds_test.meta

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ names:
77
- "-DPROFILING_TESTS=OFF"
88
- "-DCOMPILE_TOOLS=ON"
99
- "-DSYSTEM_TESTS=ON"
10-
ctest-args: [
11-
"--repeat", "until-pass:3",
12-
"--timeout", "300",
13-
"--label-exclude", "xfail"
14-
]
1510
googletest-distribution:
1611
cmake-args:
1712
- "-Dgtest_force_shared_crt=ON"

.github/workflows/mac-ci.yml

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ on:
1111
description: 'Extra arguments for colcon cli'
1212
required: false
1313
type: string
14+
colcon-test-args:
15+
description: 'Extra arguments for colcon test cli'
16+
required: false
17+
type: string
1418
cmake-args:
1519
description: 'Extra arguments for cmake cli'
1620
required: false
@@ -51,6 +55,7 @@ jobs:
5155
with:
5256
label: ${{ inputs.label || 'mac-ci' }}
5357
colcon-args: ${{ inputs.colcon-args }}
58+
colcon-test-args: ${{ inputs.colcon-test-args }}
5459
cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
5560
ctest-args: ${{ inputs.ctest-args }}
5661
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}

.github/workflows/reusable-mac-ci.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ on:
1111
description: 'Extra arguments for colcon cli'
1212
required: false
1313
type: string
14+
colcon-test-args:
15+
description: 'Extra arguments for colcon test cli'
16+
required: false
17+
type: string
1418
cmake-args:
1519
description: 'Extra arguments for cmake cli'
1620
required: false
@@ -143,7 +147,7 @@ jobs:
143147
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
144148
with:
145149
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.meta
146-
colcon_test_args: ${{ inputs.colcon-args }}
150+
colcon_test_args: ${{ inputs.colcon-test-args }}
147151
colcon_test_args_default: --event-handlers=console_direct+
148152
ctest_args: ${{ inputs.ctest-args }}
149153
packages_names: fastdds

.github/workflows/reusable-ubuntu-ci.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
description: 'Extra arguments for colcon cli'
1616
required: false
1717
type: string
18+
colcon-test-args:
19+
description: 'Extra arguments for colcon test cli'
20+
required: false
21+
type: string
1822
cmake-args:
1923
description: 'Extra arguments for cmake cli'
2024
required: false
@@ -215,7 +219,7 @@ jobs:
215219
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
216220
with:
217221
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.meta
218-
colcon_test_args: ${{ inputs.colcon-args }}
222+
colcon_test_args: ${{ inputs.colcon-test-args }}
219223
colcon_test_args_default: --event-handlers=console_direct+
220224
ctest_args: ${{ inputs.ctest-args }}
221225
packages_names: fastdds

.github/workflows/reusable-windows-ci.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ on:
1111
description: 'Extra arguments for colcon cli'
1212
required: false
1313
type: string
14+
colcon-test-args:
15+
description: 'Extra arguments for colcon test cli'
16+
required: false
17+
type: string
1418
cmake-args:
1519
description: 'Extra arguments for cmake cli'
1620
required: false
@@ -177,7 +181,7 @@ jobs:
177181
uses: eProsima/eProsima-CI/windows/colcon_test@v0
178182
with:
179183
colcon_meta_file: ${{ github.workspace }}\src\fastdds\.github\workflows\config\fastdds_test.meta
180-
colcon_test_args: ${{ inputs.colcon-args }}
184+
colcon_test_args: ${{ inputs.colcon-test-args }}
181185
colcon_test_args_default: --event-handlers=console_direct+
182186
ctest_args: ${{ inputs.ctest-args }}
183187
packages_names: fastdds

.github/workflows/ubuntu-ci.yml

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ on:
1111
description: 'Extra arguments for colcon cli'
1212
required: false
1313
type: string
14+
colcon-test-args:
15+
description: 'Extra arguments for colcon test cli'
16+
required: false
17+
type: string
1418
cmake-args:
1519
description: 'Extra arguments for cmake cli'
1620
required: false
@@ -65,6 +69,7 @@ jobs:
6569
os-image: 'ubuntu-22.04'
6670
label: ${{ inputs.label || 'ubuntu-ci' }}
6771
colcon-args: ${{ inputs.colcon-args }}
72+
colcon-test-args: ${{ inputs.colcon-test-args }}
6873
cmake-args: ${{ inputs.cmake-args }}
6974
ctest-args: ${{ inputs.ctest-args || '-LE xfail' }}
7075
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}

.github/workflows/windows-ci.yml

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ on:
1111
description: 'Extra arguments for colcon cli'
1212
required: false
1313
type: string
14+
colcon-test-args:
15+
description: 'Extra arguments for colcon test cli'
16+
required: false
17+
type: string
1418
cmake-args:
1519
description: 'Extra arguments for cmake cli'
1620
required: false
@@ -46,6 +50,7 @@ jobs:
4650
with:
4751
label: ${{ inputs.label || 'windows-ci' }}
4852
colcon-args: ${{ inputs.colcon-args }}
53+
colcon-test-args: ${{ inputs.colcon-test-args }}
4954
cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
5055
ctest-args: ${{ inputs.ctest-args }}
5156
fastdds_branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}

0 commit comments

Comments
 (0)