Skip to content

Commit 105c9dc

Browse files
authored
Parallelize system-tests (#7954)
1 parent ea008a2 commit 105c9dc

File tree

1 file changed

+23
-16
lines changed

1 file changed

+23
-16
lines changed

.circleci/config.continue.yml.j2

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,7 @@ jobs:
816816
parameters:
817817
weblog-variant:
818818
type: string
819+
parallelism: 3
819820
steps:
820821
- setup_system_tests
821822
@@ -833,32 +834,38 @@ jobs:
833834
834835
- run:
835836
name: Run
836-
command: |
837-
cd system-tests
838-
DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh
839-
840-
- run:
841-
name: Run APM E2E default tests
842837
# Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added.
843838
no_output_timeout: 5m
844839
command: |
845840
cd system-tests
846-
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
841+
echo "
842+
DEFAULT
843+
APM_TRACING_E2E
844+
APM_TRACING_E2E_SINGLE_SPAN
845+
" | circleci tests split > scenarios.list
846+
for scenario in $(<scenarios.list); do
847+
if [[ $scenario =~ .*_E2E.* ]]; then
848+
export DD_SITE=datadoghq.com
849+
export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
850+
export DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY
851+
else
852+
export DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY
853+
fi
854+
echo "Running scenario $scenario"
855+
./run.sh $scenario
856+
done
847857
848858
- run:
849-
name: Run APM E2E Single Span tests
850-
# Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added.
851-
no_output_timeout: 5m
859+
name: Collect artifacts
852860
command: |
861+
mkdir -p artifacts
853862
cd system-tests
854-
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
855-
856-
- run:
857-
name: Collect artifacts
858-
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
863+
for log_dir in logs*; do
864+
tar -cvzf ../artifacts/${log_dir}_<< parameters.weblog-variant >>.tar.gz $log_dir
865+
done
859866
860867
- store_artifacts:
861-
path: logs_java_<< parameters.weblog-variant >>_dev.tar.gz
868+
path: artifacts
862869
863870
integrations-system-tests:
864871
machine:

0 commit comments

Comments
 (0)