Skip to content

Commit 4d5563c

Browse files
committed
Refs #21670: Edit QoS to reduce flakiness
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
1 parent a88d9cf commit 4d5563c

6 files changed

Lines changed: 98 additions & 98 deletions

File tree

.github/docker/vulcanexus/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
1010
# Avoids using interactions during building
1111
ENV DEBIAN_FRONTEND=noninteractive
1212

13-
# Use a bash shell so it is possigle to run things like `source` (required for colcon builds)
13+
# Use a bash shell so it is possible to run things like `source` (required for colcon builds)
1414
SHELL ["/bin/bash", "-c"]
1515

1616
ARG docker_image_base

ddsrouter_test/compose/test_cases/stress/cloud/reliable/compose.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ services:
6262
- cloud_edge_net
6363
volumes:
6464
- ./ddsrouter_cloud_1.yaml:/config.yaml
65-
command: ddsrouter -c /config.yaml --timeout 15
65+
command: ddsrouter -c /config.yaml --timeout 20
6666

6767
ddsrouter_cloud_2:
6868
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -73,7 +73,7 @@ services:
7373
- cloud_edge_net
7474
volumes:
7575
- ./ddsrouter_cloud_2.yaml:/config.yaml
76-
command: ddsrouter -c /config.yaml --timeout 15
76+
command: ddsrouter -c /config.yaml --timeout 20
7777

7878
ddsrouter_edge_1:
7979
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -85,7 +85,7 @@ services:
8585
- edge_1_net
8686
volumes:
8787
- ./ddsrouter_edge_1.yaml:/config.yaml
88-
command: ddsrouter -c /config.yaml --timeout 15
88+
command: ddsrouter -c /config.yaml --timeout 20
8989

9090
ddsrouter_edge_2:
9191
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -97,7 +97,7 @@ services:
9797
- edge_2_net
9898
volumes:
9999
- ./ddsrouter_edge_2.yaml:/config.yaml
100-
command: ddsrouter -c /config.yaml --timeout 15
100+
command: ddsrouter -c /config.yaml --timeout 20
101101

102102
# SUBSCRIBERS
103103
subscriber_reliable:
@@ -109,7 +109,7 @@ services:
109109
- edge_2_net
110110
volumes:
111111
- ../../../../scripts:/scripts
112-
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 15 --args "--samples 10 --domain 105 --name LargeDataTopic_reliable --reliable"
112+
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 20 --args "--samples 10 --domain 105 --name LargeDataTopic_reliable --reliable --transient-local --keep-all"
113113

114114
subscriber_1:
115115
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -120,7 +120,7 @@ services:
120120
- edge_2_net
121121
volumes:
122122
- ../../../../scripts:/scripts
123-
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_1"
123+
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_1 --keep-last 10"
124124

125125
subscriber_2:
126126
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -131,7 +131,7 @@ services:
131131
- edge_2_net
132132
volumes:
133133
- ../../../../scripts:/scripts
134-
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_2"
134+
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_2 --keep-last 10"
135135

136136

137137
subscriber_3:
@@ -143,7 +143,7 @@ services:
143143
- edge_2_net
144144
volumes:
145145
- ../../../../scripts:/scripts
146-
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_3"
146+
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 10 --allow-duplicates -1 --args "--samples 10 --domain 105 --name LargeDataTopic_3 --keep-last 10"
147147

148148
# PUBLISHERS
149149
publisher_reliable:
@@ -153,7 +153,7 @@ services:
153153
- ddsrouter_edge_1
154154
networks:
155155
- edge_1_net
156-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 10 --msg-size 1 --domain 103 --name LargeDataTopic_reliable --reliable --wait 1
156+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 10 --msg-size 1 --domain 103 --name LargeDataTopic_reliable --reliable --transient-local --keep-all --wait 1
157157

158158
publisher_1:
159159
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -162,7 +162,7 @@ services:
162162
- ddsrouter_edge_1
163163
networks:
164164
- edge_1_net
165-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_1
165+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_1 --keep-last 10 --wait 1
166166

167167
publisher_2:
168168
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -171,7 +171,7 @@ services:
171171
- ddsrouter_edge_1
172172
networks:
173173
- edge_1_net
174-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_1
174+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_1 --keep-last 10 --wait 1
175175

176176
publisher_3:
177177
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -180,7 +180,7 @@ services:
180180
- ddsrouter_edge_1
181181
networks:
182182
- edge_1_net
183-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_1
183+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_1 --keep-last 10 --wait 1
184184

185185
publisher_4:
186186
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -189,7 +189,7 @@ services:
189189
- ddsrouter_edge_1
190190
networks:
191191
- edge_1_net
192-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_1
192+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_1 --keep-last 10 --wait 1
193193

194194
publisher_5:
195195
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -198,7 +198,7 @@ services:
198198
- ddsrouter_edge_1
199199
networks:
200200
- edge_1_net
201-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_2
201+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_2 --keep-last 10 --wait 1
202202

203203
publisher_6:
204204
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -207,7 +207,7 @@ services:
207207
- ddsrouter_edge_1
208208
networks:
209209
- edge_1_net
210-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_2
210+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_2 --keep-last 10 --wait 1
211211

212212
publisher_7:
213213
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -216,7 +216,7 @@ services:
216216
- ddsrouter_edge_1
217217
networks:
218218
- edge_1_net
219-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_2
219+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_2 --keep-last 10 --wait 1
220220

221221
publisher_8:
222222
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -225,7 +225,7 @@ services:
225225
- ddsrouter_edge_1
226226
networks:
227227
- edge_1_net
228-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_2
228+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_2 --keep-last 10 --wait 1
229229

230230
publisher_9:
231231
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -234,7 +234,7 @@ services:
234234
- ddsrouter_edge_1
235235
networks:
236236
- edge_1_net
237-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_3
237+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 100000 --domain 103 --name LargeDataTopic_3 --keep-last 10 --wait 1
238238

239239
publisher_10:
240240
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -243,7 +243,7 @@ services:
243243
- ddsrouter_edge_1
244244
networks:
245245
- edge_1_net
246-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_3
246+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 200000 --domain 103 --name LargeDataTopic_3 --keep-last 10 --wait 1
247247

248248
publisher_11:
249249
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -252,7 +252,7 @@ services:
252252
- ddsrouter_edge_1
253253
networks:
254254
- edge_1_net
255-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_3
255+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 300000 --domain 103 --name LargeDataTopic_3 --keep-last 10 --wait 1
256256

257257
publisher_12:
258258
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
@@ -261,7 +261,7 @@ services:
261261
- ddsrouter_edge_1
262262
networks:
263263
- edge_1_net
264-
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_3
264+
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 100 --msg-size 400000 --domain 103 --name LargeDataTopic_3 --keep-last 10 --wait 1
265265

266266

267267
networks:

0 commit comments

Comments
 (0)