diff --git a/src/jobs/parallel_test.yml b/src/jobs/parallel_test.yml index cd6b238..aaf5a61 100755 --- a/src/jobs/parallel_test.yml +++ b/src/jobs/parallel_test.yml @@ -62,7 +62,8 @@ steps: name: Enable Test Splitting environment: PARAM_TEST_DIR: << parameters.test_directory >> - PARAM_PATTERN: << parameters.parallel_it_pattern >> + PARAM_TEST_PATTERN: << parameters.parallel_test_pattern >> + PARAM_IT_PATTERN: << parameters.parallel_it_pattern >> command: << include(scripts/enable-test-splitting.sh) >> - store_artifacts: path: .circleci/tests/ @@ -78,7 +79,7 @@ steps: working_directory: << parameters.app_src_directory >> environment: PARAM_MVN_COMMAND: << parameters.maven_command >> - PARAM_COMMAND: << parameters.maven_command >> + PARAM_COMMAND: << parameters.command >> PARAM_SETTINGS_FILE: << parameters.settings_file >> command: << include(scripts/run-parallel-tests.sh) >> - process_test_results: diff --git a/src/scripts/enable-test-splitting.sh b/src/scripts/enable-test-splitting.sh index 5222dfb..02a1f9f 100644 --- a/src/scripts/enable-test-splitting.sh +++ b/src/scripts/enable-test-splitting.sh @@ -9,13 +9,13 @@ echo -e "\033[31m\033[4mOrb Notes on Test Splitting\033[0m " mkdir -p .circleci/tests/ # generate excluded surefire tests using provided pattern -circleci tests glob "$PARAM_TEST_DIR"/"$PARAM_PATTERN" | \ +circleci tests glob "$PARAM_TEST_DIR"/"$PARAM_TEST_PATTERN" | \ sed -e "s#^$PARAM_TEST_DIR/\(.*\)\.(java|kt)#\1#" | \ tr "/" "." > .circleci/tests/surefire_classnames circleci tests split --split-by=timings --timings-type=classname < .circleci/tests/surefire_classnames > /tmp/this_node_tests grep -xvf /tmp/this_node_tests < .circleci/tests/surefire_classnames > .circleci/tests/surefire_classnames_ignore_list # generate excluded failsafe tests using provided pattern -circleci tests glob "$PARAM_TEST_DIR"/"$PARAM_PATTERN" | \ +circleci tests glob "$PARAM_TEST_DIR"/"$PARAM_IT_PATTERN" | \ sed -e "s#^$PARAM_TEST_DIR/\(.*\)\.(java|kt)#\1#" | \ tr "/" "." > .circleci/tests/failsafe_classnames circleci tests split --split-by=timings --timings-type=classname < .circleci/tests/failsafe_classnames > /tmp/this_node_it_tests