Merge branch 'master' into stable-test18

tikv · Dec 7, 2023 · e3d35c4 · e3d35c4
2 parents f82a0cd + ad232d1
commit e3d35c4
Show file tree

Hide file tree

Showing 60 changed files with 1,323 additions and 298 deletions.
diff --git a/.github/workflows/pd-tests.yaml b/.github/workflows/pd-tests.yaml
@@ -45,7 +45,7 @@ jobs:
         env:
           WORKER_ID: ${{ matrix.worker_id }}
           WORKER_COUNT: 13
-          JOB_COUNT: 10 # 11, 12 13 are for other integrations jobs
+          JOB_COUNT: 10 # 11, 12, 13 are for other integrations jobs
         run: |
           make ci-test-job JOB_COUNT=$(($JOB_COUNT)) JOB_INDEX=$WORKER_ID
           mv covprofile covprofile_$WORKER_ID

diff --git a/Makefile b/Makefile
@@ -244,6 +244,7 @@ ci-test-job: install-tools dashboard-ui
 	else \
 	for mod in $(shell ./scripts/ci-subtask.sh $(JOB_COUNT) $(JOB_INDEX)); do cd $$mod && $(MAKE) ci-test-job && cd $(ROOT_PATH) > /dev/null && cat $$mod/covprofile >> covprofile; done; \
 	fi
+	@$(FAILPOINT_DISABLE)
 
 TSO_INTEGRATION_TEST_PKGS := $(PD_PKG)/tests/server/tso