Skip to content

Commit 2d8ae69

Browse files
rsanchez15rsanchez15
authored
Enable CI for DDS Router v3 (#469)
* Enable CI for DDS Router v3 Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Divide Dockerfile build steps to verify failing layer Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Change back the calculation of ddsrouter branch Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Update devutils branch input name Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> --------- Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com>
1 parent 2845e79 commit 2d8ae69

7 files changed

Lines changed: 87 additions & 39 deletions

File tree

‎.github/docker/ddsrouter/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ WORKDIR /ddsrouter
4343

4444

4545
ARG fastcdr_branch=2.x
46-
ARG fastdds_branch=2.x
47-
ARG devutils_branch=0.x
46+
ARG fastdds_branch=3.x
47+
ARG devutils_branch=main
4848
ARG ddspipe_branch=main
4949
ARG ddsrouter_branch=main
5050

‎.github/docker/vulcanexus/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ RUN echo "Docker Base image used: ${docker_image_base}"
2020
RUN source "/opt/vulcanexus/$VULCANEXUS_DISTRO/setup.bash" && \
2121
apt-get update && \
2222
apt-get install -y \
23-
ros-humble-example-interfaces \
24-
ros-humble-example-interfaces \
25-
ros-humble-demo-nodes-cpp \
26-
ros-humble-demo-nodes-py
23+
ros-$VULCANEXUS_DISTRO-example-interfaces \
24+
ros-$VULCANEXUS_DISTRO-example-interfaces \
25+
ros-$VULCANEXUS_DISTRO-demo-nodes-cpp \
26+
ros-$VULCANEXUS_DISTRO-demo-nodes-py
2727

2828
# Copy and use run.bash as entrypoint
2929
COPY run.bash /root/run.bash

‎.github/workflows/docker-reusable-workflow.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
default: 'master'
1717
type: string
1818

19-
dev_utils_branch:
19+
devutils_branch:
2020
description: 'Branch or tag of eProsima/dev-utils repository (https://github.com/eProsima/dev-utils)'
2121
required: true
2222
default: 'main'
@@ -46,6 +46,13 @@ on:
4646
default: '_nightly'
4747
type: string
4848

49+
ref:
50+
description: >
51+
The branch or tag name to checkout.
52+
required: true
53+
type: string
54+
default: 'main'
55+
4956
env:
5057
code_packages_names: 'ddsrouter_test'
5158
docs_packages_names: ''
@@ -65,6 +72,7 @@ jobs:
6572
uses: eProsima/eProsima-CI/external/checkout@v0
6673
with:
6774
path: src
75+
ref: ${{ inputs.ref }}
6876

6977
# Build Vulcanexus Docker image
7078
- name: Build custom Vulcanexus Docker image
@@ -84,7 +92,7 @@ jobs:
8492
--no-cache \
8593
--build-arg fastcdr_branch=${{ inputs.fastcdr_branch }} \
8694
--build-arg fastdds_branch=${{ inputs.fastdds_branch }} \
87-
--build-arg dev_utils_branch=${{ inputs.dev_utils_branch }} \
95+
--build-arg devutils_branch=${{ inputs.devutils_branch }} \
8896
--build-arg ddspipe_branch=${{ inputs.ddspipe_branch }} \
8997
--build-arg ddsrouter_branch=${{ inputs.ddsrouter_branch }} \
9098
-t ${{ env.DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE }} \

‎.github/workflows/mirror.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: mirror-branch
2+
3+
on:
4+
push:
5+
branches:
6+
- 'main'
7+
8+
jobs:
9+
mirror_job_main:
10+
if: github.ref == 'refs/heads/main'
11+
runs-on: ubuntu-latest
12+
name: Mirror main branch to API & ABI compatible minor version branches
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
dest_branch:
17+
- '3.x'
18+
steps:
19+
- name: Mirror action step
20+
id: mirror
21+
uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
22+
with:
23+
github-token: ${{ secrets.GITHUB_TOKEN }}
24+
source: 'main'
25+
dest: ${{ matrix.dest_branch }}

‎.github/workflows/nightly.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,42 @@ jobs:
1313
with:
1414
custom_version_build: 'v2'
1515
dependencies_artifact_postfix: '_nightly'
16+
ref: '2.x'
1617
secrets: inherit
1718

18-
# Uncomment this block to run the tests for Fast DDS v3 when DDS Router is updated
19-
# Also specify here (and above) the workflow version/branch to use (@v0, @main, etc.)
20-
# reusable_tests_v3:
21-
# name: reusable_tests_v3
22-
# uses: ./.github/workflows/reusable-workflow.yml
23-
# with:
24-
# custom_version_build: 'v3'
25-
# dependencies_artifact_postfix: '_nightly'
26-
# secrets: inherit
19+
reusable_tests_v3:
20+
name: reusable_tests_v3
21+
uses: ./.github/workflows/reusable-workflow.yml
22+
with:
23+
custom_version_build: 'v3'
24+
dependencies_artifact_postfix: '_nightly'
25+
ref: 'main'
26+
secrets: inherit
2727

2828
reusable_docker_tests_v2:
2929
name: reusable_docker_tests_v2
3030
uses: ./.github/workflows/docker-reusable-workflow.yml
3131
with:
3232
fastcdr_branch: '2.x'
3333
fastdds_branch: '2.x'
34-
dev_utils_branch: '0.x'
35-
ddspipe_branch: 'main'
36-
ddsrouter_branch: 'main'
34+
devutils_branch: '0.x'
35+
ddspipe_branch: '0.x'
36+
ddsrouter_branch: '2.x'
3737
custom_version_build: 'v2'
3838
dependencies_artifact_postfix: '_nightly'
39+
ref: '2.x'
3940
secrets: inherit
4041

41-
# Uncomment this block to run the tests for Fast DDS v3 when DDS Router is updated
42-
# Also specify here (and above) the workflow version/branch to use (@v0, @main, etc.)
43-
# reusable_docker_tests_v3:
44-
# name: reusable_docker_tests_v3
45-
# uses: ./.github/workflows/docker-reusable-workflow.yml
46-
# with:
47-
# fastcdr_branch: '2.x'
48-
# fastdds_branch: '3.x'
49-
# ddspipe_branch: 'main'
50-
# ddsrouter_branch: 'main'
51-
# custom_version_build: 'v3'
52-
# dependencies_artifact_postfix: '_nightly'
53-
# secrets: inherit
42+
reusable_docker_tests_v3:
43+
name: reusable_docker_tests_v3
44+
uses: ./.github/workflows/docker-reusable-workflow.yml
45+
with:
46+
fastcdr_branch: '2.x'
47+
fastdds_branch: '3.x'
48+
devutils_branch: '1.x'
49+
ddspipe_branch: '1.x'
50+
custom_version_build: 'v3'
51+
dependencies_artifact_postfix: '_nightly'
52+
ref: 'main'
53+
secrets: inherit
5454

‎.github/workflows/reusable-workflow.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ on:
5959
default: '_nightly'
6060
type: string
6161

62+
ref:
63+
description: >
64+
The branch or tag name to checkout.
65+
required: true
66+
type: string
67+
default: 'main'
68+
6269
env:
6370
code_packages_names: 'ddsrouter_core ddsrouter_yaml ddsrouter_tool'
6471
docs_packages_names: 'ddsrouter_docs'
@@ -88,6 +95,7 @@ jobs:
8895
uses: eProsima/eProsima-CI/external/checkout@v0
8996
with:
9097
path: src
98+
ref: ${{ inputs.ref }}
9199

92100
- name: Download dependencies and install requirements
93101
uses: ./src/.github/actions/project_dependencies
@@ -129,6 +137,7 @@ jobs:
129137
uses: eProsima/eProsima-CI/external/checkout@v0
130138
with:
131139
path: src
140+
ref: ${{ inputs.ref }}
132141

133142
- name: Download dependencies and install requirements
134143
uses: ./src/.github/actions/project_dependencies
@@ -166,6 +175,7 @@ jobs:
166175
uses: eProsima/eProsima-CI/external/checkout@v0
167176
with:
168177
path: src
178+
ref: ${{ inputs.ref }}
169179

170180
- name: Download dependencies and install requirements
171181
uses: ./src/.github/actions/project_dependencies
@@ -203,6 +213,7 @@ jobs:
203213
uses: eProsima/eProsima-CI/external/checkout@v0
204214
with:
205215
path: src
216+
ref: ${{ inputs.ref }}
206217

207218
- name: Download dependencies and install requirements
208219
uses: ./src/.github/actions/project_dependencies
@@ -233,6 +244,7 @@ jobs:
233244
uses: eProsima/eProsima-CI/external/checkout@v0
234245
with:
235246
path: src
247+
ref: ${{ inputs.ref }}
236248

237249
- name: Download dependencies and install requirements
238250
uses: ./src/.github/actions/project_dependencies
@@ -263,6 +275,7 @@ jobs:
263275
uses: eProsima/eProsima-CI/external/checkout@v0
264276
with:
265277
path: src
278+
ref: ${{ inputs.ref }}
266279

267280
- name: Download dependencies and install requirements
268281
uses: ./src/.github/actions/project_dependencies

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
default: 'master'
1818
type: string
1919

20-
dev_utils_branch:
20+
devutils_branch:
2121
description: 'Branch or tag of eProsima/dev-utils repository (https://github.com/eProsima/dev-utils)'
2222
required: true
2323
default: 'main'
@@ -63,19 +63,21 @@ jobs:
6363
name: reusable_tests
6464
uses: ./.github/workflows/reusable-workflow.yml
6565
with:
66-
custom_version_build: ${{ inputs.custom_version_build || 'v2' }}
66+
custom_version_build: ${{ inputs.custom_version_build || 'v3' }}
6767
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_nightly' }}
68+
ref: ${{ github.ref }}
6869
secrets: inherit
6970

7071
reusable_docker_tests:
7172
name: reusable_docker_tests
7273
uses: ./.github/workflows/docker-reusable-workflow.yml
7374
with:
7475
fastcdr_branch: ${{ inputs.fastcdr_branch || '2.x' }}
75-
fastdds_branch: ${{ inputs.fastdds_branch || '2.x' }}
76-
dev_utils_branch: ${{ inputs.dev_utils_branch || 'main' }}
77-
ddspipe_branch: ${{ inputs.ddspipe_branch || 'main' }}
76+
fastdds_branch: ${{ inputs.fastdds_branch || '3.x' }}
77+
devutils_branch: ${{ inputs.devutils_branch || '1.x' }}
78+
ddspipe_branch: ${{ inputs.ddspipe_branch || '1.x' }}
7879
ddsrouter_branch: ${{ inputs.ddsrouter_branch || github.head_ref || github.ref_name }}
79-
custom_version_build: ${{ inputs.custom_version_build || 'v2' }}
80+
custom_version_build: ${{ inputs.custom_version_build || 'v3' }}
8081
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_nightly' }}
82+
ref: ${{ github.ref }}
8183
secrets: inherit

0 commit comments

Comments
 (0)