Skip to content

Commit 22338f3

Browse files
JesusPoderosoEduPonz
JesusPoderoso
and
EduPonz
authored
Refactor Fast DDS Ubuntu CI to include several tests (#4860)
* Refs #20822: Split current job into different jobs Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Add shapes demo build job Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Add discovery server build test job Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Add python build test job Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Add documentation build test job Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Remove previous documentation workflow Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Avoid building with tests if not running tests Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Try to fix documentation job Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Move conditions to reusable workflows Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Apply internal review suggestions Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Refactor meta files into build and test, and combine them in test steps Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Remove matrix from ubuntu CI Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Revert "Refs #20822: Move conditions to reusable workflows" This reverts commit d4eea0d. * Refs #20822: Apply rev suggestions Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Add missing discovery server requirements in the job Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Apply rev suggestions (2) Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Fixing windows workflow by merging metas Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Add step with alternative builds Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Use colcon test meta in all jobs, and fix xfail filter Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Remove redundant CMake args, and fix alternative builds Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Apply rev suggestions (3) Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Explicitly compare boolean inputs Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20822: Install tools on test steps to avoid losing symlink permissions Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20822: Update discovery_server meta file name Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Adjust ternary operators Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20822: Use CCache based on an input parameter Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Signed-off-by: eduponz <eduardoponz@eprosima.com> Co-authored-by: eduponz <eduardoponz@eprosima.com>
1 parent 984405b commit 22338f3

16 files changed

Lines changed: 780 additions & 261 deletions

.github/workflows/config/asan_colcon.meta renamed to .github/workflows/config/asan.meta

File renamed without changes.

‎.github/workflows/config/discovery_server.meta‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
names:
2+
fastdds:
3+
cmake-args:
4+
- "-DCOMPILE_TOOLS=ON"
5+
- "-DINSTALL_TOOLS=ON"
6+
discovery-server:
7+
ctest-args: [
8+
"--repeat", "until-pass:3",
9+
"--timeout", "300",
10+
"--label-exclude", "xfail"
11+
]

‎.github/workflows/config/documentation.meta‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
names:
2-
fastdds:
3-
cmake-args:
4-
- "-DBUILD_SHARED_LIBS=ON"
5-
- "-DSECURITY=ON"
6-
- "-DTHIRDPARTY_Asio=FORCE"
7-
- "-DTHIRDPARTY_TinyXML2=FORCE"
8-
- "-DTHIRDPARTY_UPDATE=OFF"
92
fastdds-docs:
103
cmake-args:
114
- "-DBUILD_DOCUMENTATION=ON"
125
- "-DCOMPILE_TESTS=ON"
6+
ctest-args: [
7+
"--timeout", "500"
8+
]
139
googletest-distribution:
1410
cmake-args:
1511
- "-Dgtest_force_shared_crt=ON"

.github/workflows/config/ci.meta renamed to .github/workflows/config/fastdds_build.meta

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,12 @@ names:
22
fastdds:
33
cmake-args:
44
- "-DBUILD_DOCUMENTATION=OFF"
5-
- "-DBUILD_SHARED_LIBS=ON"
65
- "-DCOMPILE_EXAMPLES=ON"
7-
- "-DEPROSIMA_BUILD_TESTS=ON"
86
- "-DFASTDDS_ENFORCE_LOG_INFO=ON"
9-
- "-DFASTDDS_PIM_API_TESTS=ON"
10-
- "-DFASTDDS_STATISTICS=ON"
117
- "-DINSTALL_EXAMPLES=ON"
12-
- "-DINSTALL_TOOLS=ON"
138
- "-DINTERNAL_DEBUG=ON"
149
- "-DNO_TLS=OFF"
15-
- "-DPERFORMANCE_TESTS=ON"
16-
- "-DPROFILING_TESTS=OFF"
1710
- "-DSHM_TRANSPORT_DEFAULT=ON"
1811
- "-DSTRICT_REALTIME=OFF"
19-
- "-DSYSTEM_TESTS=ON"
2012
- "-DMEMORYCHECK_COMMAND_OPTIONS=-q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=2 --error-exitcode=1"
2113
- "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastdds/valgrind.supp"
22-
googletest-distribution:
23-
cmake-args:
24-
- "-Dgtest_force_shared_crt=ON"
25-
- "-DBUILD_SHARED_LIBS=ON"
26-
- "-DBUILD_GMOCK=ON"

‎.github/workflows/config/fastdds_test.meta‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
names:
2+
fastdds:
3+
cmake-args:
4+
- "-DEPROSIMA_BUILD_TESTS=ON"
5+
- "-DFASTDDS_PIM_API_TESTS=ON"
6+
- "-DPERFORMANCE_TESTS=ON"
7+
- "-DPROFILING_TESTS=OFF"
8+
- "-DCOMPILE_TOOLS=ON"
9+
- "-DSYSTEM_TESTS=ON"
10+
ctest-args: [
11+
"--repeat", "until-pass:3",
12+
"--timeout", "300",
13+
"--label-exclude", "xfail"
14+
]
15+
googletest-distribution:
16+
cmake-args:
17+
- "-Dgtest_force_shared_crt=ON"
18+
- "-DBUILD_SHARED_LIBS=ON"
19+
- "-DBUILD_GMOCK=ON"

.github/workflows/config/ci.repos renamed to .github/workflows/config/fastdds_test.repos

File renamed without changes.

‎.github/workflows/config/python_test.meta‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
names:
2+
fastdds_python:
3+
cmake-args:
4+
- "-DBUILD_TESTING=ON"
5+
- "-DBUILD_DOCUMENTATION=ON"
6+
ctest-args: [
7+
"--repeat", "until-pass:3",
8+
"--timeout", "300",
9+
"--label-exclude", "xfail"
10+
]
11+
googletest-distribution:
12+
cmake-args:
13+
- "-Dgtest_force_shared_crt=ON"
14+
- "-DBUILD_SHARED_LIBS=ON"
15+
- "-DBUILD_GMOCK=ON"

.github/workflows/config/tsan_colcon.meta renamed to .github/workflows/config/tsan.meta

File renamed without changes.

‎.github/workflows/documentation-tests.yaml‎

Lines changed: 0 additions & 159 deletions
This file was deleted.

‎.github/workflows/nightly-ubuntu-ci.yml‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ jobs:
1313
os-image:
1414
- 'ubuntu-22.04'
1515
security:
16-
- 'ON'
17-
- 'OFF'
16+
- true
17+
- false
1818
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@master
1919
with:
2020
os-image: ${{ matrix.os-image }}
2121
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-master'
22-
cmake-args: "-DSECURITY=${{ matrix.security }}"
2322
ctest-args: "-LE xfail"
2423
fastdds-branch: 'master'
24+
security: ${{ matrix.security }}
25+
run-tests: true
26+
use-ccache: true
2527

2628
nightly-ubuntu-ci-2_14_x:
2729
strategy:
@@ -30,15 +32,17 @@ jobs:
3032
os-image:
3133
- 'ubuntu-22.04'
3234
security:
33-
- 'ON'
34-
- 'OFF'
35+
- true
36+
- false
3537
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.14.x
3638
with:
3739
os-image: ${{ matrix.os-image }}
3840
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.14.x'
39-
cmake-args: "-DSECURITY=${{ matrix.security }}"
4041
ctest-args: "-LE xfail"
4142
fastdds-branch: '2.14.x'
43+
security: ${{ matrix.security }}
44+
run-tests: true
45+
use-ccache: true
4246

4347
nightly-ubuntu-ci-2_13_x:
4448
strategy:
@@ -47,15 +51,17 @@ jobs:
4751
os-image:
4852
- 'ubuntu-22.04'
4953
security:
50-
- 'ON'
51-
- 'OFF'
54+
- true
55+
- false
5256
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.13.x
5357
with:
5458
os-image: ${{ matrix.os-image }}
5559
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.13.x'
56-
cmake-args: "-DSECURITY=${{ matrix.security }}"
5760
ctest-args: "-LE xfail"
5861
fastdds-branch: '2.13.x'
62+
security: ${{ matrix.security }}
63+
run-tests: true
64+
use-ccache: true
5965

6066
nightly-ubuntu-ci-2_10_x:
6167
strategy:
@@ -64,15 +70,17 @@ jobs:
6470
os-image:
6571
- 'ubuntu-22.04'
6672
security:
67-
- 'ON'
68-
- 'OFF'
73+
- true
74+
- false
6975
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.10.x
7076
with:
7177
os-image: ${{ matrix.os-image }}
7278
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.10.x'
73-
cmake-args: "-DSECURITY=${{ matrix.security }}"
7479
ctest-args: "-LE xfail"
7580
fastdds-branch: '2.10.x'
81+
security: ${{ matrix.security }}
82+
run-tests: true
83+
use-ccache: true
7684

7785
nightly-ubuntu-ci-2_6_x:
7886
strategy:
@@ -81,12 +89,14 @@ jobs:
8189
os-image:
8290
- 'ubuntu-22.04'
8391
security:
84-
- 'ON'
85-
- 'OFF'
92+
- true
93+
- false
8694
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x
8795
with:
8896
os-image: ${{ matrix.os-image }}
8997
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
90-
cmake-args: "-DSECURITY=${{ matrix.security }}"
9198
ctest-args: "-LE xfail"
9299
fastdds-branch: '2.6.x'
100+
security: ${{ matrix.security }}
101+
run-tests: true
102+
use-ccache: true

0 commit comments

Comments
 (0)