Prepare to rename py3_flake8 tests to flake8

4 files changed, 14 insertions, 8 deletions

diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index f1084eb3a0..331eb7fa2f 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -75,7 +75,9 @@
         "5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
         "5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
         "4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
+        "5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
         "4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
+        "5517239368": "https://devtools-registry.s3.yandex.net/5517239368",
         "3833498694": "https://devtools-registry.s3.yandex.net/3833498694",
         "3167009386": "https://devtools-registry.s3.yandex.net/3167009386",
         "3050798466": "https://devtools-registry.s3.yandex.net/3050798466",
@@ -178,7 +180,9 @@
         "5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "4307890075": "flake8_linter for linux",
+        "5517245192": "flake8_linter for linux",
         "4307901240": "flake8_linter for linux-aarch64",
+        "5517239368": "flake8_linter for linux-aarch64",
         "3833498694": "gdb 11.2 for osx_10.15_catalina",
         "3167009386": "openjdk 11.0.15 vanilla for darwin",
         "3050798466": "openjdk 11.0.15 vanilla for darwin-arm64",
diff --git a/build/plugins/lib/test_const/__init__.py b/build/plugins/lib/test_const/__init__.py
index 4765aea563..d137b01342 100644
--- a/build/plugins/lib/test_const/__init__.py
+++ b/build/plugins/lib/test_const/__init__.py
@@ -72,6 +72,7 @@ STYLE_TEST_TYPES = [
     "ktlint",
     "py2_flake8",
     "py3_flake8",
+    "flake8",
     "black",
 ]
 
diff --git a/build/plugins/pybuild.py b/build/plugins/pybuild.py
index b9a4343acf..6c493fc346 100644
--- a/build/plugins/pybuild.py
+++ b/build/plugins/pybuild.py
@@ -172,7 +172,8 @@ def add_python_lint_checks(unit, py_ver, files):
             flake8_cfg = 'build/config/tests/flake8/flake8.conf'
             migrations_cfg = 'build/rules/flake8/migrations.yaml'
             resource = "build/external_resources/flake8_py{}".format(py_ver)
-            lint_name = "py{}_flake8".format(py_ver)
+            # TODO YA-1534: Replace py3_flake8 by flake8 after ya-bin release
+            lint_name = "py2_flake8" if py_ver == 2 else "py3_flake8"
             params = [lint_name, "tools/flake8_linter/flake8_linter"]
             params += ["FILES"] + resolved_files
             params += ["GLOBAL_RESOURCES", resource]
diff --git a/build/prebuilt/tools/flake8_linter/resources.json b/build/prebuilt/tools/flake8_linter/resources.json
index 565c8be7f9..351f06920f 100644
--- a/build/prebuilt/tools/flake8_linter/resources.json
+++ b/build/prebuilt/tools/flake8_linter/resources.json
@@ -1,22 +1,22 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:4307900052"
+            "uri": "sbr:5517229869"
         },
         "darwin-arm64": {
-            "uri": "sbr:4307900057"
+            "uri": "sbr:5517214042"
         },
         "linux": {
-            "uri": "sbr:4307890075"
+            "uri": "sbr:5517245192"
         },
         "linux-aarch64": {
-            "uri": "sbr:4307901240"
+            "uri": "sbr:5517239368"
         },
         "linux-ppc64le": {
-            "uri": "sbr:4307897255"
+            "uri": "sbr:5517231212"
         },
-        "win32-clang-cl": {
-            "uri": "sbr:4307903123"
+        "win32": {
+            "uri": "sbr:5517255802"
         }
     }
 }