فهرست منبع

Update makefile and Jenkins job to run test projects separately

GitOrigin-RevId: b1fbae22be53904128245e171d5b8a674697710b
Andrew Rumble 9 ماه پیش
والد
کامیت
0cc7bb0fd7
2فایلهای تغییر یافته به همراه23 افزوده شده و 4 حذف شده
  1. 11 2
      services/web/Jenkinsfile
  2. 12 2
      services/web/Makefile

+ 11 - 2
services/web/Jenkinsfile

@@ -269,11 +269,20 @@ pipeline {
             }
           }
         }
-        stage('Test Unit ESM') {
+        stage('Test Unit ESM - Parallel') {
           steps {
             dir('services/web') {
               retry(count: 3) {
-                sh "make test_unit_esm"
+                sh "make test_unit_esm_parallel"
+              }
+            }
+          }
+        }
+        stage('Test Unit ESM - Sequential') {
+          steps {
+            dir('services/web') {
+              retry(count: 3) {
+                sh "make test_unit_esm_sequential"
               }
             }
           }

+ 12 - 2
services/web/Makefile

@@ -106,11 +106,21 @@ test_unit_mocha: export COMPOSE_PROJECT_NAME=unit_test_mocha_$(BUILD_DIR_NAME)
 test_unit_mocha: mongo_migrations_for_tests
 	$(DOCKER_COMPOSE) run --rm test_unit npm run test:unit:mocha
 
-test_unit_esm: export MOCHA_ROOT_SUITE_NAME = ESM unit tests
-test_unit_esm: export COMPOSE_PROJECT_NAME=unit_test_esm_$(BUILD_DIR_NAME)
+test_unit_esm: export VITEST_ROOT_SUITE_NAME = ESM unit tests - parallel
+test_unit_esm: export COMPOSE_PROJECT_NAME=unit_test_esm_parallel_$(BUILD_DIR_NAME)
 test_unit_esm: mongo_migrations_for_tests
 	$(DOCKER_COMPOSE) run --rm test_unit npm run test:unit:esm
 
+test_unit_esm_parallel: export VITEST_ROOT_SUITE_NAME = ESM unit tests - parallel
+test_unit_esm_parallel: export COMPOSE_PROJECT_NAME=unit_test_esm_parallel_$(BUILD_DIR_NAME)
+test_unit_esm_parallel: mongo_migrations_for_tests
+	$(DOCKER_COMPOSE) run --rm test_unit npm run test:unit:esm:parallel
+
+test_unit_esm_sequential: export VITEST_ROOT_SUITE_NAME = ESM unit tests - sequential
+test_unit_esm_sequential: export COMPOSE_PROJECT_NAME=unit_test_esm_sequential_$(BUILD_DIR_NAME)
+test_unit_esm_sequential: mongo_migrations_for_tests
+	$(DOCKER_COMPOSE) run --rm test_unit npm run test:unit:esm:sequential
+
 test_unit_esm_watch: export COMPOSE_PROJECT_NAME=unit_test_esm_watch_$(BUILD_DIR_NAME)
 test_unit_esm_watch: mongo_migrations_for_tests
 	$(DOCKER_COMPOSE) run --rm test_unit npm run test:unit:esm:watch