Split debuild build and test

and make release tests more DRY
ros-navigation · Aug 10, 2019 · 4364521 · 4364521
1 parent 813c8d9
commit 4364521
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -299,49 +299,52 @@ jobs:
       - checkout_source
       - setup_dependencies
       - build_source
-      - test_build
-      - report_coverage
   release_build:
     executor: release_exec
     steps:
       - checkout_source
       - setup_dependencies
       - build_source
-  test_rmw_connext_cpp:
-    executor: release_exec
-    environment:
-      RMW_IMPLEMENTATION: "rmw_connext_cpp"
+  debug_test: &debug_test
+    executor: debug_exec
     steps:
       - restore_build
       - test_build
-  test_rmw_fastrtps_cpp:
+      - report_coverage
+  release_test: &release_test
     executor: release_exec
-    environment:
-      RMW_IMPLEMENTATION: "rmw_fastrtps_cpp"
     steps:
       - restore_build
       - test_build
-  test_rmw_opensplice_cpp:
-    executor: release_exec
+  release_test_rmw_connext_cpp:
+    <<: *release_test
+    environment:
+      RMW_IMPLEMENTATION: "rmw_connext_cpp"
+  release_test_rmw_fastrtps_cpp:
+    <<: *release_test
+    environment:
+      RMW_IMPLEMENTATION: "rmw_fastrtps_cpp"
+  release_test_rmw_opensplice_cpp:
+    <<: *release_test
     environment:
       RMW_IMPLEMENTATION: "rmw_opensplice_cpp"
-    steps:
-      - restore_build
-      - test_build
 
 workflows:
   version: 2
   build-test:
     jobs:
       - debug_build
+      - debug_test:
+          requires:
+            - debug_build
       - release_build
-      - test_rmw_connext_cpp:
+      - release_test_rmw_connext_cpp:
           requires:
             - release_build
-      - test_rmw_fastrtps_cpp:
+      - release_test_rmw_fastrtps_cpp:
           requires:
             - release_build
-      - test_rmw_opensplice_cpp:
+      - release_test_rmw_opensplice_cpp:
           requires:
             - release_build
   nightly:
@@ -354,12 +357,12 @@ workflows:
                 - master
     jobs:
       - release_build
-      - test_rmw_connext_cpp:
+      - release_test_rmw_connext_cpp:
           requires:
             - release_build
-      - test_rmw_fastrtps_cpp:
+      - release_test_rmw_fastrtps_cpp:
           requires:
             - release_build
-      - test_rmw_opensplice_cpp:
+      - release_test_rmw_opensplice_cpp:
           requires:
             - release_build