Add macro PARALLEL_TESTS_WITHIN_NODE instead of PARALLEL_TESTS_ON_YT_WITHIN_NODE

commit_hash:bd1fe3dc21384114babda849102561d4f08dd944

Author: bgaifullin

build/plugins/_dart_fields.py

@@ -431,24 +431,39 @@ def value(cls, unit, flat_args, spec_args):
 
 
 class ParallelTestsInSingleNode:
-    KEY = 'PARALLEL-TESTS-WITHIN-NODE-ON-YT'
+    KEY = 'PARALLEL-TESTS-WITHIN-NODE-WORKERS'
 
     @classmethod
     def value(cls, unit, flat_args, spec_args):
-        value = unit.get('PARALLEL_TESTS_ON_YT_WITHIN_NODE_WORKERS')
+        return cls.get_value(unit, "PARALLEL_TESTS_WITHIN_NODE_WORKERS")
+
+    @classmethod
+    def get_value(cls, unit, key):
+        value = unit.get(key)
 
         if value:
             value = value.lower()
-            if value != 'all' and not (value.isnumeric() and int(value) > 0):
+            if value == 'all':
+                value = 'auto'
+            if value != 'auto' and not (value.isnumeric() and int(value) > 0):
                 raise DartValueError(
-                    'Incorrect value of PARALLEL_TESTS_ON_YT_WITHIN_NODE. Expected either "all" or a positive integer value, got: {}'.format(
+                    'Incorrect value of PARALLEL_TESTS_WITHIN_NODE. Expected either "auto" or a positive integer value, got: {}'.format(
                         value,
                     ),
                 )
 
         return value
 
 
+# TODO(bulatman) Temporary class for backward compatibility.
+class ParallelTestsInSingleNodeOnYt:
+    KEY = 'PARALLEL-TESTS-WITHIN-NODE-ON-YT'
+
+    @classmethod
+    def value(cls, unit, flat_args, spec_args):
+        return ParallelTestsInSingleNode.get_value(unit, "PARALLEL_TESTS_ON_YT_WITHIN_NODE_WORKERS")
+
+
 class ForkMode:
     KEY = 'FORK-MODE'
 

build/plugins/ytest.py

@@ -58,6 +58,7 @@
 YTEST_FIELDS_EXTRA = (
     df.Blob.value,
     df.ParallelTestsInSingleNode.value,
+    df.ParallelTestsInSingleNodeOnYt.value,
     df.ForkMode.from_macro_and_unit,
     df.Size.from_macro_args_and_unit,
     df.Tag.from_macro_args_and_unit,

build/ymake.core.conf

@@ -2848,15 +2848,23 @@ macro VALIDATE_DATA_RESTART(Ext) {
 }
 
 PARALLEL_TESTS_ON_YT_WITHIN_NODE_WORKERS=
+PARALLEL_TESTS_WITHIN_NODE_WORKERS=
 # tag:test
-### @usage: PARALLEL_TESTS_ON_YT_WITHIN_NODE(CPUS)
+### @usage: PARALLEL_TESTS_ON_YT_WITHIN_NODE(COUNT)
 ###
 ### Execute tests in parallel within one node.
+###
+### Supported for execution tests on yt/sandbox and local run. Ignored for unsupported test types and environments.
 ### May cause some tests to break due to races or other circumstances.
-### Allowed values of CPUS: 'all' to run tests in all available CPUs, or integer amount of workers used.
+###
+### Allowed values of COUNT:
+### 'auto' to run tests in all available CPUs according to requirements, or integer amount of workers used.
+###
 ### EXPERIMENTAL! DO NOT USE IF YOU ARE NOT SURE.
-macro PARALLEL_TESTS_ON_YT_WITHIN_NODE(CPUS) {
-    SET(PARALLEL_TESTS_ON_YT_WITHIN_NODE_WORKERS $CPUS)
+macro PARALLEL_TESTS_ON_YT_WITHIN_NODE(COUNT) {
+    # TODO(bulatman) For backward compatibility, remove after release of ya-bin.
+    SET(PARALLEL_TESTS_ON_YT_WITHIN_NODE_WORKERS $COUNT)
+    SET(PARALLEL_TESTS_WITHIN_NODE_WORKERS $COUNT)
 }
 
 # tag:test