Modify QoS of tests to reduce flakiness (#513)

* Refs #21670: Edit QoS to reduce flakiness

Signed-off-by: cferreiragonz <[email protected]>

* Refs #21670: Edit Docker network prune

Signed-off-by: cferreiragonz <[email protected]>

* Refs #21670: Raise test timeout

Signed-off-by: cferreiragonz <[email protected]>

* Refs #21670: Fix domain

Signed-off-by: cferreiragonz <[email protected]>

* Refs #21670: Improve tcp_repeater test

Signed-off-by: cferreiragonz <[email protected]>

* Refs #21670: Raise timeout for stress_cloud_reliable

Signed-off-by: cferreiragonz <[email protected]>

* Refs #21670: Increase timeouts

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>

Author: cferreiragonz

.github/docker/vulcanexus/Dockerfile

@@ -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

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

@@ -136,7 +136,7 @@ jobs:
             --return-code-on-test-failure \
             --ctest-args \
               --label-regex xfail \
-              --timeout 120
+              --timeout 240
 
       - name: Run tests
         run: |
@@ -149,4 +149,4 @@ jobs:
             --return-code-on-test-failure \
             --ctest-args \
               --label-exclude xfail \
-              --timeout 120
+              --timeout 240

ddsrouter_test/compose/docker-compose.sh

@@ -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}
 }

ddsrouter_test/compose/test_cases/repeater_tcp/compose.yml

@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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:

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

@@ -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}
@@ -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}
@@ -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}
@@ -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:
@@ -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}
@@ -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}
@@ -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:
@@ -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:
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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: