Skip to content

[21670] Modify QoS of tests to reduce flakiness #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juanlofer-eprosima merged 7 commits into from
Jun 23, 2025
Merged

[21670] Modify QoS of tests to reduce flakiness #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d5563c
Refs #21670: Edit QoS to reduce flakiness
cferreiragonz Jun 13, 2025
84e573b
Refs #21670: Edit Docker network prune
cferreiragonz Jun 16, 2025
aeae5bc
Refs #21670: Raise test timeout
cferreiragonz Jun 16, 2025
306d3d4
Refs #21670: Fix domain
cferreiragonz Jun 16, 2025
5ba2ec2
Refs #21670: Improve tcp_repeater test
cferreiragonz Jun 17, 2025
5728f36
Refs #21670: Raise timeout for stress_cloud_reliable
cferreiragonz Jun 20, 2025
65072a9
Refs #21670: Increase timeouts
cferreiragonz Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/docker/vulcanexus/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Avoids using interactions during building
ENV DEBIAN_FRONTEND=noninteractive

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

ARG docker_image_base
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-reusable-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
--return-code-on-test-failure \
--ctest-args \
--label-regex xfail \
--timeout 120
--timeout 240

- name: Run tests
run: |
Expand All @@ -149,4 +149,4 @@ jobs:
--return-code-on-test-failure \
--ctest-args \
--label-exclude xfail \
--timeout 120
--timeout 240
3 changes: 1 addition & 2 deletions ddsrouter_test/compose/docker-compose.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,7 @@ main ()
echo "${TEST_NAME} exited with code ${EXIT_CODE}"

# Clean containers and networks before exiting and do not prompt for confirmation
docker container prune --force
docker network prune --force
docker compose -f ${COMPOSE_FILE} down --remove-orphans --timeout 20

exit ${EXIT_CODE}
}
Expand Down
12 changes: 6 additions & 6 deletions ddsrouter_test/compose/test_cases/repeater_tcp/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ services:
- cloud_edge_net
volumes:
- ./ddsrouter_cloud.yaml:/config.yaml
command: ddsrouter -c /config.yaml --timeout 12
command: ddsrouter -c /config.yaml --timeout 60

ddsrouter_edge_1:
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
Expand All @@ -53,7 +53,7 @@ services:
- edge_1_net
volumes:
- ./ddsrouter_edge_1.yaml:/config.yaml
command: ddsrouter -c /config.yaml --timeout 12
command: ddsrouter -c /config.yaml --timeout 60

pub_edge_1:
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
Expand All @@ -62,7 +62,7 @@ services:
- ddsrouter_edge_1
networks:
- edge_1_net
command: build/fastdds_configuration_example/configuration publisher -i 100 -s 110 -d 1
command: build/fastdds_configuration_example/configuration publisher -i 100 -s 110 -d 1 --reliable

sub_edge_1:
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
Expand All @@ -73,7 +73,7 @@ services:
- edge_1_net
volumes:
- ../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --args "--domain 1 --samples 20"
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 60 --args "--domain 1 --samples 20 --reliable"

ddsrouter_edge_2:
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
Expand All @@ -85,7 +85,7 @@ services:
- edge_2_net
volumes:
- ./ddsrouter_edge_2.yaml:/config.yaml
command: ddsrouter -c /config.yaml --timeout 12
command: ddsrouter -c /config.yaml --timeout 60

sub_edge_2:
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
Expand All @@ -96,7 +96,7 @@ services:
- edge_2_net
volumes:
- ../../scripts:/scripts
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 12 --args "--domain 2 --samples 20"
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 20 --timeout 60 --args "--domain 2 --samples 20 --reliable"

networks:
edge_1_net:
Expand Down
42 changes: 21 additions & 21 deletions ddsrouter_test/compose/test_cases/stress/cloud/reliable/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ services:
- cloud_edge_net
volumes:
- ./ddsrouter_cloud_1.yaml:/config.yaml
command: ddsrouter -c /config.yaml --timeout 15
command: ddsrouter -c /config.yaml --timeout 60

ddsrouter_cloud_2:
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
Expand All @@ -73,7 +73,7 @@ services:
- cloud_edge_net
volumes:
- ./ddsrouter_cloud_2.yaml:/config.yaml
command: ddsrouter -c /config.yaml --timeout 15
command: ddsrouter -c /config.yaml --timeout 60

ddsrouter_edge_1:
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
Expand All @@ -85,7 +85,7 @@ services:
- edge_1_net
volumes:
- ./ddsrouter_edge_1.yaml:/config.yaml
command: ddsrouter -c /config.yaml --timeout 15
command: ddsrouter -c /config.yaml --timeout 60

ddsrouter_edge_2:
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
Expand All @@ -97,7 +97,7 @@ services:
- edge_2_net
volumes:
- ./ddsrouter_edge_2.yaml:/config.yaml
command: ddsrouter -c /config.yaml --timeout 15
command: ddsrouter -c /config.yaml --timeout 60

# SUBSCRIBERS
subscriber_reliable:
Expand All @@ -109,7 +109,7 @@ services:
- edge_2_net
volumes:
- ../../../../scripts:/scripts
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"
command: python3 /scripts/execute_and_validate_subscriber.py --exe build/fastdds_configuration_example/configuration --samples 10 --timeout 60 --args "--samples 10 --domain 105 --name LargeDataTopic_reliable --reliable --transient-local --keep-all"

subscriber_1:
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
Expand All @@ -120,7 +120,7 @@ services:
- edge_2_net
volumes:
- ../../../../scripts:/scripts
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"
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"

subscriber_2:
image: ${DDSROUTER_COMPOSE_TEST_DOCKER_IMAGE}
Expand All @@ -131,7 +131,7 @@ services:
- edge_2_net
volumes:
- ../../../../scripts:/scripts
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"
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"


subscriber_3:
Expand All @@ -143,7 +143,7 @@ services:
- edge_2_net
volumes:
- ../../../../scripts:/scripts
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"
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"

# PUBLISHERS
publisher_reliable:
Expand All @@ -153,7 +153,7 @@ services:
- ddsrouter_edge_1
networks:
- edge_1_net
command: build/fastdds_configuration_example/configuration publisher --interval 100 --samples 10 --msg-size 1 --domain 103 --name LargeDataTopic_reliable --reliable --wait 1
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

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

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

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

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

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

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

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

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

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

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

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

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


networks:
Expand Down
Loading
Loading