Skip to content

Commit

Permalink
check
Browse files Browse the repository at this point in the history
Signed-off-by: husharp <jinhao.hu@pingcap.com>
  • Loading branch information
HuSharp committed Jan 29, 2024
1 parent 9a82b47 commit 05bad8b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ basic-test: install-tools

ci-test-job: install-tools dashboard-ui
@$(FAILPOINT_ENABLE)
./scripts/ci-subtask.sh $(JOB_COUNT) $(JOB_INDEX)
./scripts/ci-subtask.sh $(JOB_COUNT) $(JOB_INDEX) || { $(FAILPOINT_DISABLE); exit 1; }
@$(FAILPOINT_DISABLE)

TSO_INTEGRATION_TEST_PKGS := $(PD_PKG)/tests/server/tso
Expand Down
20 changes: 7 additions & 13 deletions scripts/ci-subtask.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,14 @@ if [[ $2 -gt 10 ]]; then
integrations_dir=./tests/integrations
integrations_tasks=($(find "$integrations_dir" -mindepth 1 -maxdepth 1 -type d))
# Currently, we only have 3 integration tests, so we can hardcode the task index.
for t in ${integrations_tasks[@]}; do
if [[ "$t" = "$integrations_dir/client" && "$2" = 11 ]]; then
for t in "${integrations_tasks[@]}"; do
if [[ "$t" = "$integrations_dir/client" && $2 -eq 11 ]]; then
cd ./client && make ci-test-job && cd .. && cat ./client/covprofile >> covprofile
cd $integrations_dir && make ci-test-job test_name=client
cd $ROOT_PATH && cat $integrations_dir/client/covprofile >> covprofile
break
elif [[ "$t" = "$integrations_dir/tso" && "$2" = 12 ]]; then
cd $integrations_dir && make ci-test-job test_name=tso
cd $ROOT_PATH && cat $integrations_dir/tso/covprofile >> covprofile
break
elif [[ "$t" = "$integrations_dir/mcs" && "$2" = 13 ]]; then
cd $integrations_dir && make ci-test-job test_name=mcs
cd $ROOT_PATH && cat $integrations_dir/mcs/covprofile >> covprofile
break
cd $integrations_dir && make ci-test-job test_name=client && cat ./client/covprofile >> "$ROOT_PATH/covprofile" || exit 1
elif [[ "$t" = "$integrations_dir/tso" && $2 -eq 12 ]]; then
cd $integrations_dir && make ci-test-job test_name=tso && cat ./tso/covprofile >> "$ROOT_PATH/covprofile" || exit 1
elif [[ "$t" = "$integrations_dir/mcs" && $2 -eq 13 ]]; then
cd $integrations_dir && make ci-test-job test_name=mcs && cat ./mcs/covprofile >> "$ROOT_PATH/covprofile" || exit 1
fi
done
else
Expand Down

0 comments on commit 05bad8b

Please sign in to comment.