Skip to content

Commit 2384639

Browse files
Mario-DLmergify[bot]
Mario-DL
authored and
mergify[bot]
committed
Add Ubuntu weekly ci (#5038)
* Refs #21267: Add weekly ubuntu CI to test 2.x branches with CDR 1.1.x Signed-off-by: Mario Dominguez <[email protected]> * Refs #21267: Change windows reusable ci to use new merge meta files eProsima CI action Signed-off-by: Mario Dominguez <[email protected]> * Refs #21267: move the !(skip_ci) inside the reusable workflows Signed-off-by: Mario Dominguez <[email protected]> * Refs #21267: compile fastdds_python package only Signed-off-by: Mario Dominguez <[email protected]> * Refs #21267: Apply Jesus suggestions Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]> (cherry picked from commit e6773fb) # Conflicts: # .github/workflows/nightly-ubuntu-ci.yml # .github/workflows/reusable-ubuntu-ci.yml # .github/workflows/reusable-windows-ci.yml # .github/workflows/weekly-ubuntu-ci.yml
1 parent 13f3003 commit 2384639

File tree

5 files changed

+176
-4
lines changed

5 files changed

+176
-4
lines changed

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

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: Fast DDS Ubuntu CI (nightly)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 1 * * *'
7+
8+
jobs:
9+
nightly-ubuntu-ci-master:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
os-image:
14+
- 'ubuntu-22.04'
15+
security:
16+
- true
17+
- false
18+
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@master
19+
with:
20+
os-image: ${{ matrix.os-image }}
21+
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-master'
22+
ctest-args: "-LE xfail"
23+
fastdds-branch: 'master'
24+
security: ${{ matrix.security }}
25+
run-build: true
26+
run-tests: true
27+
use-ccache: false
28+
29+
nightly-ubuntu-ci-2_14_x:
30+
strategy:
31+
fail-fast: false
32+
matrix:
33+
os-image:
34+
- 'ubuntu-22.04'
35+
security:
36+
- true
37+
- false
38+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
39+
with:
40+
os-image: ${{ matrix.os-image }}
41+
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.14.x'
42+
ctest-args: "-LE xfail"
43+
fastdds-branch: '2.14.x'
44+
security: ${{ matrix.security }}
45+
run-build: true
46+
run-tests: true
47+
use-ccache: false
48+
49+
nightly-ubuntu-ci-2_13_x:
50+
strategy:
51+
fail-fast: false
52+
matrix:
53+
os-image:
54+
- 'ubuntu-22.04'
55+
security:
56+
- true
57+
- false
58+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
59+
with:
60+
os-image: ${{ matrix.os-image }}
61+
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.13.x'
62+
ctest-args: "-LE xfail"
63+
fastdds-branch: '2.13.x'
64+
security: ${{ matrix.security }}
65+
run-build: true
66+
run-tests: true
67+
use-ccache: false
68+
69+
nightly-ubuntu-ci-2_10_x:
70+
strategy:
71+
fail-fast: false
72+
matrix:
73+
os-image:
74+
- 'ubuntu-22.04'
75+
security:
76+
- true
77+
- false
78+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
79+
with:
80+
os-image: ${{ matrix.os-image }}
81+
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.10.x'
82+
ctest-args: "-LE xfail"
83+
fastdds-branch: '2.10.x'
84+
security: ${{ matrix.security }}
85+
run-build: true
86+
run-tests: true
87+
use-ccache: false
88+

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

+31
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,21 @@ on:
2727
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
2828
required: true
2929
type: string
30+
fastcdr-branch:
31+
description: 'Branch or tag of Fast CDR repository (https://github.com/eProsima/Fast-CDR)'
32+
required: false
33+
type: string
34+
default: 'master'
3035
security:
3136
description: 'Enable security features'
3237
required: false
3338
type: boolean
3439
default: true
40+
run-build:
41+
description: 'Build Fast DDS (CI skipped otherwise)'
42+
required: false
43+
type: boolean
44+
default: true
3545
run-tests:
3646
description: 'Run test suite of Fast DDS, Fast DDS python, and Fast DDS Discovery Server'
3747
required: false
@@ -53,6 +63,7 @@ defaults:
5363
jobs:
5464
fastdds_build:
5565
runs-on: ${{ inputs.os-image }}
66+
if: ${{ inputs.run-build == true }}
5667
strategy:
5768
fail-fast: false
5869
matrix:
@@ -105,6 +116,20 @@ jobs:
105116
with:
106117
api_token: ${{ secrets.GITHUB_TOKEN }}
107118

119+
- name: Get Fast CDR branch
120+
id: get_fastcdr_branch
121+
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
122+
with:
123+
remote_repository: eProsima/Fast-CDR
124+
fallback_branch: ${{ inputs.fastcdr-branch }}
125+
126+
- name: Download Fast CDR
127+
uses: eProsima/eProsima-CI/external/checkout@v0
128+
with:
129+
repository: eProsima/Fast-CDR
130+
path: ${{ github.workspace }}/src/fastcdr
131+
ref: ${{ steps.get_fastcdr_branch.outputs.deduced_branch }}
132+
108133
- name: Fetch Fast DDS dependencies
109134
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
110135
with:
@@ -295,11 +320,17 @@ jobs:
295320
continue-on-error: false
296321
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
297322
with:
323+
<<<<<<< HEAD
298324
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_build.meta
299325
colcon_build_args: ${{ inputs.colcon-args }}
326+
=======
327+
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta
328+
colcon_build_args: ${{ inputs.colcon-args }} --packages-select fastdds_python
329+
>>>>>>> e6773fb0b (Add Ubuntu weekly ci (#5038))
300330
cmake_args: '${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}'
301331
cmake_args_default: ''
302332
cmake_build_type: ${{ matrix.cmake-build-type }}
333+
workspace_dependencies: ${{ github.workspace }}/install
303334
workspace: ${{ github.workspace }}
304335

305336
- name: Upload python build artifacts

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

+7
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ jobs:
142142
skip_existing: 'true'
143143

144144
- name: Prepare build meta file
145+
<<<<<<< HEAD
145146
run: |
146147
$build_meta_file = '${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_build.meta'
147148
$test_meta_file = '${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_test.meta'
@@ -158,6 +159,12 @@ jobs:
158159
159160
# Write the combined content to the build test meta file
160161
$combined_content | Out-File -FilePath $build_test_meta_file -Encoding UTF8
162+
=======
163+
uses: eProsima/eProsima-CI/windows/merge_yaml_metas@v0
164+
with:
165+
metas: "@('${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta', '${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.meta')"
166+
path: '${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build_test.meta'
167+
>>>>>>> e6773fb0b (Add Ubuntu weekly ci (#5038))
161168

162169
- name: Build
163170
id: build

‎.github/workflows/ubuntu-ci.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ concurrency:
5454
jobs:
5555
ubuntu-ci:
5656

57-
if: ${{ (
58-
!contains(github.event.pull_request.labels.*.name, 'skip-ci') &&
59-
!contains(github.event.pull_request.labels.*.name, 'conflicts')
60-
) }}
57+
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
6158
uses: ./.github/workflows/reusable-ubuntu-ci.yml
6259
with:
6360
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
@@ -69,5 +66,6 @@ jobs:
6966
ctest-args: ${{ inputs.ctest-args || '-LE xfail' }}
7067
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '2.14.x' }}
7168
security: ${{ ((inputs.security == true) && true) || github.event_name == 'pull_request' }}
69+
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
7270
run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) }}
7371
use-ccache: ${{ ((inputs.use-ccache == true) && true) || false }}

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

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Fast DDS Ubuntu CI (weekly)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 0 * * 1' # Run at minute 0 on Monday
7+
8+
jobs:
9+
10+
weekly-ubuntu-ci-2_14_x:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
fastcdr-branch:
15+
- '1.1.x'
16+
- '2.x'
17+
security:
18+
- true
19+
- false
20+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
21+
with:
22+
os-image: 'ubuntu-22.04'
23+
label: 'weekly-sec-${{ matrix.security }}-fastcdr-${{ matrix.fastcdr-branch }}-ubuntu-ci-2.14.x'
24+
ctest-args: "-LE xfail"
25+
fastdds-branch: '2.14.x'
26+
fastcdr-branch: ${{ matrix.fastcdr-branch }}
27+
security: ${{ matrix.security }}
28+
run-build: true
29+
run-tests: true
30+
use-ccache: false
31+
32+
weekly-ubuntu-ci-2_6_x:
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
security:
37+
- true
38+
- false
39+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
40+
with:
41+
os-image: 'ubuntu-20.04'
42+
label: 'weekly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
43+
ctest-args: "-LE xfail"
44+
fastdds-branch: '2.6.x'
45+
security: ${{ matrix.security }}
46+
run-build: true
47+
run-tests: true
48+
use-ccache: false

0 commit comments

Comments
 (0)