Parallelize system-tests scenarios

Author: smola

.circleci/config.continue.yml.j2

@@ -816,6 +816,7 @@ jobs:
     parameters:
       weblog-variant:
         type: string
+    parallelism: 4
     steps:
       - setup_system_tests
 
@@ -831,78 +832,65 @@ jobs:
             cd system-tests
             ./build.sh java --weblog-variant << parameters.weblog-variant >>
 
-      - run:
-          name: Run
-          command: |
-            cd system-tests
-            DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh
-
-      - run:
-          name: Run APM E2E default tests
-          # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added.
-          no_output_timeout: 5m
-          command: |
-            cd system-tests
-            DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh APM_TRACING_E2E
-
-      - run:
-          name: Run APM E2E Single Span tests
-          # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added.
-          no_output_timeout: 5m
-          command: |
-            cd system-tests
-            DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh APM_TRACING_E2E_SINGLE_SPAN
-
-      - run:
-          name: Collect artifacts
-          command: tar -cvzf logs_java_<< parameters.weblog-variant >>_dev.tar.gz -C system-tests logs logs_apm_tracing_e2e logs_apm_tracing_e2e_single_span
-
-      - store_artifacts:
-          path: logs_java_<< parameters.weblog-variant >>_dev.tar.gz
-
-  appsec-system-tests:
-    machine:
-      image: ubuntu-2404:current
-    resource_class: medium
-    parameters:
-      weblog-variant:
-        type: string
-    steps:
-      - setup_system_tests
+      - when:
+          condition:
+            equal: [0, "${CIRCLE_NODE_INDEX}" ]
+          steps:
+            - run:
+                name: Run
+                command: |
+                  cd system-tests
+                  DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh
 
-      - run:
-          name: Copy jar file to system test binaries folder
-          command: |
-            ls -la ~/dd-trace-java/workspace/dd-java-agent/build/libs
-            cp ~/dd-trace-java/workspace/dd-java-agent/build/libs/*.jar system-tests/binaries/
+      - when:
+          condition:
+            equal: [1, "${CIRCLE_NODE_INDEX}" ]
+          steps:
+            - run:
+                name: Run APM E2E default tests
+                # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added.
+                no_output_timeout: 5m
+                command: |
+                  cd system-tests
+                  DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh APM_TRACING_E2E
 
-      - run:
-          name: Build
-          command: |
-            cd system-tests
-            ./build.sh java --weblog-variant << parameters.weblog-variant >>
+            - run:
+                name: Run APM E2E Single Span tests
+                # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added.
+                no_output_timeout: 5m
+                command: |
+                  cd system-tests
+                  DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh APM_TRACING_E2E_SINGLE_SPAN
 
-      - run:
-          name: Run APPSEC_RASP tests
-          command: |
-            cd system-tests
-            DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh APPSEC_RASP
+      - when:
+          condition:
+            equal: [2, "${CIRCLE_NODE_INDEX}" ]
+          steps:
+            - run:
+                name: Run APPSEC_RASP tests
+                command: |
+                  cd system-tests
+                  DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh APPSEC_RASP
 
-      - run:
-          name: Run APPSEC_RUNTIME_ACTIVATION tests
-          command: |
-            cd system-tests
-            DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh APPSEC_RUNTIME_ACTIVATION
+            - run:
+                name: Run REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD tests
+                command: |
+                  cd system-tests
+                  DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD
 
-      - run:
-          name: Run REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD tests
-          command: |
-            cd system-tests
-            DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD
+      - when:
+          condition:
+            equal: [3, "${CIRCLE_NODE_INDEX}" ]
+          steps:
+            - run:
+                name: Run APPSEC_RUNTIME_ACTIVATION tests
+                command: |
+                  cd system-tests
+                  DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh APPSEC_RUNTIME_ACTIVATION
 
       - run:
           name: Collect artifacts
-          command: tar -cvzf logs_java_<< parameters.weblog-variant >>_dev.tar.gz -C system-tests logs_*
+          command: tar -cvzf logs_java_<< parameters.weblog-variant >>_dev_${CIRCLE_NODE_INDEX}.tar.gz -C system-tests logs*
 
       - store_artifacts:
           path: logs_java_<< parameters.weblog-variant >>_dev.tar.gz
@@ -1442,12 +1430,6 @@ build_test_jobs: &build_test_jobs
       matrix:
           <<: *system_test_matrix
 
-  - appsec-system-tests:
-      requires:
-        - ok_to_test
-      matrix:
-          <<: *system_test_matrix
-
   - integrations-system-tests:
       requires:
         - ok_to_test