Intermediate changes

4 files changed, 20 insertions, 14 deletions

diff --git a/build/conf/license.conf b/build/conf/license.conf
index 5197299979..3a3e0c54fe 100644
--- a/build/conf/license.conf
+++ b/build/conf/license.conf
@@ -376,6 +376,7 @@ LICENSES_REQUIRE_CITATION= \
     Unicode-DFS-2016 \
     Unicode-Icu-58 \
     Unicode-Mappings \
+    Unittest-Permissive-License \
     Unlicense \
     Unrar \
     UPL-1.0 \
diff --git a/build/conf/project_specific/yql_udf.conf b/build/conf/project_specific/yql_udf.conf
index 8a75dc6788..c2cc5218fa 100644
--- a/build/conf/project_specific/yql_udf.conf
+++ b/build/conf/project_specific/yql_udf.conf
@@ -40,12 +40,14 @@ module YQL_UDF_TEST: PY3TEST_BIN {
 
     DEPENDS(contrib/ydb/library/yql/tools/astdiff)
     DEPENDS(contrib/ydb/library/yql/tools/yqlrun)
+    DEPENDS(contrib/ydb/library/yql/tools/udf_resolver)
     DATA(arcadia/contrib/ydb/library/yql/mount)
     DATA(arcadia/contrib/ydb/library/yql/cfg/udf_test)
     ENV(YQL_ASTDIFF_PATH="contrib/ydb/library/yql/tools/astdiff/astdiff")
     ENV(YQL_CONFIG_DIR="contrib/ydb/library/yql/cfg/udf_test")
     ENV(YQL_YQLRUN_PATH="contrib/ydb/library/yql/tools/yqlrun/yqlrun")
     ENV(YQL_SQL2YQL_PATH="contrib/ydb/library/yql/tools/sql2yql/sql2yql")
+    ENV(YQL_UDFRESOLVER_PATH="contrib/ydb/library/yql/tools/udf_resolver/udf_resolver")
 }
 
 module YQL_UDF_YDB_TEST: PY3TEST_BIN {
@@ -55,6 +57,7 @@ module YQL_UDF_YDB_TEST: PY3TEST_BIN {
 
     DEPENDS(ydb/library/yql/tools/astdiff)
     DEPENDS(ydb/library/yql/tools/yqlrun)
+    DEPENDS(ydb/library/yql/tools/udf_resolver)
     DATA(arcadia/ydb/library/yql/mount)
     DATA(arcadia/ydb/library/yql/cfg/udf_test)
 }
@@ -66,12 +69,14 @@ module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN {
 
     DEPENDS(contrib/ydb/library/yql/tools/astdiff)
     DEPENDS(contrib/ydb/library/yql/tools/yqlrun)
+    DEPENDS(contrib/ydb/library/yql/tools/udf_resolver)
     DATA(arcadia/contrib/ydb/library/yql/mount)
     DATA(arcadia/contrib/ydb/library/yql/cfg/udf_test)
     ENV(YQL_ASTDIFF_PATH="contrib/ydb/library/yql/tools/astdiff/astdiff")
     ENV(YQL_CONFIG_DIR="contrib/ydb/library/yql/cfg/udf_test")
     ENV(YQL_YQLRUN_PATH="contrib/ydb/library/yql/tools/yqlrun/yqlrun")
     ENV(YQL_SQL2YQL_PATH="contrib/ydb/library/yql/tools/sql2yql/sql2yql")
+    ENV(YQL_UDFRESOLVER_PATH="contrib/ydb/library/yql/tools/udf_resolver/udf_resolver")
 }
 
 ### @usage: _ADD_YQL_UDF_DEPS()
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 5d9d9a801f..95b78d2ac3 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -63,8 +63,8 @@
         "3968796477": "http://devtools-registry.s3.yandex.net/3968796477",
         "3968796981": "http://devtools-registry.s3.yandex.net/3968796981",
         "3968797636": "http://devtools-registry.s3.yandex.net/3968797636",
-        "5386809135": "http://devtools-registry.s3.yandex.net/5386809135",
-        "5386759014": "http://devtools-registry.s3.yandex.net/5386759014",
+        "5360700919": "http://devtools-registry.s3.yandex.net/5360700919",
+        "5360699619": "http://devtools-registry.s3.yandex.net/5360699619",
         "4307900052": "http://devtools-registry.s3.yandex.net/4307900052",
         "4307900057": "http://devtools-registry.s3.yandex.net/4307900057",
         "4307890075": "http://devtools-registry.s3.yandex.net/4307890075",
@@ -162,8 +162,8 @@
         "3968796477": "devtools/ya/test/programs/flake8/py3/flake8 for linux-aarch64",
         "3968796981": "devtools/ya/test/programs/flake8/py3/flake8 for linux-ppc64le",
         "3968797636": "devtools/ya/test/programs/flake8/py3/flake8 for win32",
-        "5386809135": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
-        "5386759014": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
+        "5360700919": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "5360699619": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "4307900052": "flake8_linter for darwin",
         "4307900057": "flake8_linter for darwin-arm64",
         "4307890075": "flake8_linter for linux",
diff --git a/build/platform/test_tool/host.ya.make.inc b/build/platform/test_tool/host.ya.make.inc
index c519f0f357..41813a9459 100644
--- a/build/platform/test_tool/host.ya.make.inc
+++ b/build/platform/test_tool/host.ya.make.inc
@@ -1,17 +1,17 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5386806256)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5386754279)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5360699648)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5360698288)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5386805280)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5386752133)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5360699112)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5360697535)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5386809135)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5386759014)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5360700919)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5360699619)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5386803981)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5386750030)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5360698627)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5360696765)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5386807476)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5386756543)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5360700342)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5360698968)
 
 ENDIF()