diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5900d4a97..c6c11366c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -157,7 +157,7 @@ jobs: /bin/bash ci/build_naive.sh router: - runs-on: [ self-hosted, linux, light ] + runs-on: [ self-hosted, linux, k8s-runner-no-compose ] needs: gh_build_image container: image: "ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}/datalens_ci_with_code:${{ github.sha }}" @@ -246,7 +246,7 @@ jobs: pytest_split: name: Split pytest into jobs for each test type - runs-on: [ self-hosted, linux, light ] + runs-on: [ self-hosted, linux, k8s-runner-no-compose ] needs: [ router, check-skip-tests-label ] if: ${{ needs.check-skip-tests-label.outputs.result != 'true' }} @@ -445,7 +445,7 @@ jobs: run_tests_ext_public: name: "🐍[pytest][ext_public]${{ matrix.value }}" # using light runners for now, TBD: change when we have ext_public - runs-on: [ self-hosted, linux, light ] + runs-on: [ self-hosted, linux, k8s-runner-ext-public ] permissions: packages: read contents: read @@ -502,7 +502,7 @@ jobs: retention-days: 1 mypy: - runs-on: [ self-hosted, linux, light ] + runs-on: [ self-hosted, linux, k8s-runner-no-compose ] needs: gh_build_image container: # until https://github.com/github/docs/issues/25520 is resolved, using vars @@ -557,7 +557,7 @@ jobs: echo "All tests passed" codestyle_all: - runs-on: [ self-hosted, linux, light ] + runs-on: [ self-hosted, linux, k8s-runner-no-compose ] needs: gh_build_image container: # until https://github.com/github/docs/issues/25520 is resolved, using vars diff --git a/lib/dl_api_client/pyproject.toml b/lib/dl_api_client/pyproject.toml index 60bcc2732..e35aa4920 100644 --- a/lib/dl_api_client/pyproject.toml +++ b/lib/dl_api_client/pyproject.toml @@ -34,6 +34,7 @@ testpaths = [] root_dir = "dl_api_client_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_api_commons/pyproject.toml b/lib/dl_api_commons/pyproject.toml index cf029446b..5c691b7ce 100644 --- a/lib/dl_api_commons/pyproject.toml +++ b/lib/dl_api_commons/pyproject.toml @@ -47,6 +47,7 @@ testpaths = [] root_dir = "dl_api_commons_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_api_connector/pyproject.toml b/lib/dl_api_connector/pyproject.toml index ce9a04c30..e81b4ea39 100644 --- a/lib/dl_api_connector/pyproject.toml +++ b/lib/dl_api_connector/pyproject.toml @@ -44,6 +44,7 @@ testpaths = ["dl_api_connector_tests/unit"] root_dir = "dl_api_connector_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_api_lib/pyproject.toml b/lib/dl_api_lib/pyproject.toml index 91ef4f699..657b28404 100644 --- a/lib/dl_api_lib/pyproject.toml +++ b/lib/dl_api_lib/pyproject.toml @@ -67,6 +67,7 @@ timeout = 600 root_dir = "dl_api_lib_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [datalens.pytest.db] root_dir = "dl_api_lib_tests/" diff --git a/lib/dl_auth_api_lib/pyproject.toml b/lib/dl_auth_api_lib/pyproject.toml index 2fc1cbe28..0c627a3e2 100644 --- a/lib/dl_auth_api_lib/pyproject.toml +++ b/lib/dl_auth_api_lib/pyproject.toml @@ -39,10 +39,10 @@ minversion = "6.0" addopts = "-ra" testpaths = ["dl_auth_api_lib_tests/ext", "dl_auth_api_lib_tests/unit"] -[datalens.pytest.local] +[datalens.pytest.unit] root_dir = "dl_auth_api_lib_tests/" target_path = "unit" -labels = ["fat"] +labels = ["no_compose"] [datalens.pytest.ext] root_dir = "dl_auth_api_lib_tests/" diff --git a/lib/dl_configs/pyproject.toml b/lib/dl_configs/pyproject.toml index 5f6af053a..3044bf1b6 100644 --- a/lib/dl_configs/pyproject.toml +++ b/lib/dl_configs/pyproject.toml @@ -36,6 +36,7 @@ testpaths = [] root_dir = "dl_configs_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_bigquery/pyproject.toml b/lib/dl_connector_bigquery/pyproject.toml index 4a02adf25..d3a90d8f0 100644 --- a/lib/dl_connector_bigquery/pyproject.toml +++ b/lib/dl_connector_bigquery/pyproject.toml @@ -74,6 +74,7 @@ testpaths = ["dl_connector_bigquery_tests/ext", "dl_connector_bigquery_tests/uni [datalens.pytest.unit] root_dir = "dl_connector_bigquery_tests/unit" skip_compose = "true" +labels = ["no_compose"] [datalens.pytest.ext] root_dir = "dl_connector_bigquery_tests/ext" diff --git a/lib/dl_connector_bitrix_gds/pyproject.toml b/lib/dl_connector_bitrix_gds/pyproject.toml index 413a03408..1e65e54c2 100644 --- a/lib/dl_connector_bitrix_gds/pyproject.toml +++ b/lib/dl_connector_bitrix_gds/pyproject.toml @@ -63,6 +63,7 @@ labels = ["ext_public"] root_dir = "dl_connector_bitrix_gds_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_chyt/pyproject.toml b/lib/dl_connector_chyt/pyproject.toml index 0d06781f9..e432db8f3 100644 --- a/lib/dl_connector_chyt/pyproject.toml +++ b/lib/dl_connector_chyt/pyproject.toml @@ -56,6 +56,7 @@ testpaths = [] root_dir = "dl_connector_chyt_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_clickhouse/pyproject.toml b/lib/dl_connector_clickhouse/pyproject.toml index 2b2682b2d..8ca55a79b 100644 --- a/lib/dl_connector_clickhouse/pyproject.toml +++ b/lib/dl_connector_clickhouse/pyproject.toml @@ -76,11 +76,15 @@ testpaths = ["dl_connector_clickhouse_tests/db", "dl_connector_clickhouse_tests/ [datalens.pytest.unit] -root_dir = "dl_connector_clickhouse_tests/unit" +root_dir = "dl_connector_clickhouse_tests/" +target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [datalens.pytest.db] -root_dir = "dl_connector_clickhouse_tests/db" +root_dir = "dl_connector_clickhouse_tests/" +target_path = "db" +labels = ["fat"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_greenplum/pyproject.toml b/lib/dl_connector_greenplum/pyproject.toml index d1115d800..759b95092 100644 --- a/lib/dl_connector_greenplum/pyproject.toml +++ b/lib/dl_connector_greenplum/pyproject.toml @@ -52,6 +52,7 @@ target_path = "db" root_dir = "dl_connector_greenplum_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_metrica/pyproject.toml b/lib/dl_connector_metrica/pyproject.toml index 9673c6540..9da71da90 100644 --- a/lib/dl_connector_metrica/pyproject.toml +++ b/lib/dl_connector_metrica/pyproject.toml @@ -69,6 +69,7 @@ labels = ["ext_public"] root_dir = "dl_connector_metrica_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_mssql/pyproject.toml b/lib/dl_connector_mssql/pyproject.toml index 9c773c2a9..b7a6c1fc9 100644 --- a/lib/dl_connector_mssql/pyproject.toml +++ b/lib/dl_connector_mssql/pyproject.toml @@ -68,12 +68,14 @@ testpaths = ["dl_connector_mssql_tests/db", "dl_connector_mssql_tests/unit"] [datalens.pytest.db] root_dir = "dl_connector_mssql_tests/" -target_path = "db unit" +target_path = "db" +labels=["fat"] [datalens.pytest.unit] root_dir = "dl_connector_mssql_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_mysql/pyproject.toml b/lib/dl_connector_mysql/pyproject.toml index 2546e7a70..5fd079bcf 100644 --- a/lib/dl_connector_mysql/pyproject.toml +++ b/lib/dl_connector_mysql/pyproject.toml @@ -65,9 +65,16 @@ minversion = "6.0" addopts = "-ra" testpaths = ["dl_connector_mysql_tests/db", "dl_connector_mysql_tests/unit"] -[datalens.pytest.local] +[datalens.pytest.db] root_dir = "dl_connector_mysql_tests/" -target_path = "db unit" +target_path = "db" +labels=["fat"] + +[datalens.pytest.unit] +root_dir = "dl_connector_mysql_tests/" +target_path = "unit" +skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_oracle/pyproject.toml b/lib/dl_connector_oracle/pyproject.toml index facb4e3d1..f10187e04 100644 --- a/lib/dl_connector_oracle/pyproject.toml +++ b/lib/dl_connector_oracle/pyproject.toml @@ -68,11 +68,13 @@ testpaths = ["dl_connector_oracle_tests/db", "dl_connector_oracle_tests/unit"] [datalens.pytest.db] root_dir = "dl_connector_oracle_tests/" target_path = "db" +labels = ["fat"] [datalens.pytest.unit] root_dir = "dl_connector_oracle_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_promql/pyproject.toml b/lib/dl_connector_promql/pyproject.toml index e29f3fe0b..7ad7752c9 100644 --- a/lib/dl_connector_promql/pyproject.toml +++ b/lib/dl_connector_promql/pyproject.toml @@ -61,6 +61,7 @@ target_path = "db" root_dir = "dl_connector_promql_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_snowflake/pyproject.toml b/lib/dl_connector_snowflake/pyproject.toml index 89c3fe2bf..aba9129be 100644 --- a/lib/dl_connector_snowflake/pyproject.toml +++ b/lib/dl_connector_snowflake/pyproject.toml @@ -90,6 +90,7 @@ skip_tests = true root_dir = "dl_connector_snowflake_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_connector_ydb/pyproject.toml b/lib/dl_connector_ydb/pyproject.toml index 2f43a54be..ba76ca610 100644 --- a/lib/dl_connector_ydb/pyproject.toml +++ b/lib/dl_connector_ydb/pyproject.toml @@ -70,11 +70,13 @@ testpaths = [] root_dir = "dl_connector_ydb_tests/" target_path = "db" compose_file_base = "docker-compose" +labels = ["fat"] [datalens.pytest.unit] root_dir = "dl_connector_ydb_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_core/pyproject.toml b/lib/dl_core/pyproject.toml index 4fcaf7e44..c6d175a63 100644 --- a/lib/dl_core/pyproject.toml +++ b/lib/dl_core/pyproject.toml @@ -82,6 +82,7 @@ timeout = 600 root_dir = "dl_core_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [datalens.pytest.db] root_dir = "dl_core_tests/" diff --git a/lib/dl_formula/pyproject.toml b/lib/dl_formula/pyproject.toml index 640b59c00..77cec5126 100644 --- a/lib/dl_formula/pyproject.toml +++ b/lib/dl_formula/pyproject.toml @@ -64,6 +64,7 @@ testpaths = [] root_dir = "dl_formula_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.poetry.scripts] bi-formula-cli = "dl_formula.scripts.formula_cli:main" diff --git a/lib/dl_formula_ref/pyproject.toml b/lib/dl_formula_ref/pyproject.toml index 0915ba488..59e751b97 100644 --- a/lib/dl_formula_ref/pyproject.toml +++ b/lib/dl_formula_ref/pyproject.toml @@ -45,6 +45,7 @@ testpaths = [] root_dir = "dl_formula_ref_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [datalens.pytest.db] root_dir = "dl_formula_ref_tests/" diff --git a/lib/dl_model_tools/pyproject.toml b/lib/dl_model_tools/pyproject.toml index 8cbeeff17..757a0699d 100644 --- a/lib/dl_model_tools/pyproject.toml +++ b/lib/dl_model_tools/pyproject.toml @@ -40,6 +40,7 @@ testpaths = [] root_dir = "dl_model_tools_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_query_processing/pyproject.toml b/lib/dl_query_processing/pyproject.toml index b35633ea2..88e0681fb 100644 --- a/lib/dl_query_processing/pyproject.toml +++ b/lib/dl_query_processing/pyproject.toml @@ -43,6 +43,7 @@ timeout = 600 root_dir = "dl_query_processing_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_rate_limiter/pyproject.toml b/lib/dl_rate_limiter/pyproject.toml index 93f6ba101..012a1e3a4 100644 --- a/lib/dl_rate_limiter/pyproject.toml +++ b/lib/dl_rate_limiter/pyproject.toml @@ -49,6 +49,7 @@ strict_optional = true [datalens.pytest.unit] root_dir = "dl_rate_limiter_tests/unit" skip_compose = "true" +labels = ["no_compose"] [datalens.pytest.db] root_dir = "dl_rate_limiter_tests/db" diff --git a/lib/dl_rls/pyproject.toml b/lib/dl_rls/pyproject.toml index be04e1e87..6ad3c9b30 100644 --- a/lib/dl_rls/pyproject.toml +++ b/lib/dl_rls/pyproject.toml @@ -34,6 +34,7 @@ testpaths = [] root_dir = "dl_rls_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_sqlalchemy_bitrix/pyproject.toml b/lib/dl_sqlalchemy_bitrix/pyproject.toml index af0b451d0..5b502823b 100644 --- a/lib/dl_sqlalchemy_bitrix/pyproject.toml +++ b/lib/dl_sqlalchemy_bitrix/pyproject.toml @@ -30,6 +30,7 @@ testpaths = ["dl_sqlalchemy_bitrix_tests/unit"] root_dir = "dl_sqlalchemy_bitrix_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [datalens.meta.mypy] targets = [] # ignore mypy in entire module diff --git a/lib/dl_task_processor/pyproject.toml b/lib/dl_task_processor/pyproject.toml index 5a9c3aeaa..ed3b05ebd 100644 --- a/lib/dl_task_processor/pyproject.toml +++ b/lib/dl_task_processor/pyproject.toml @@ -43,6 +43,7 @@ asyncio_mode = "auto" root_dir = "dl_task_processor_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [datalens.pytest.db] root_dir = "dl_task_processor_tests/" diff --git a/lib/dl_testing/pyproject.toml b/lib/dl_testing/pyproject.toml index 790f5140a..ce89eab44 100644 --- a/lib/dl_testing/pyproject.toml +++ b/lib/dl_testing/pyproject.toml @@ -38,6 +38,7 @@ testpaths = [] root_dir = "dl_testing_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_type_transformer/pyproject.toml b/lib/dl_type_transformer/pyproject.toml index 63dc3496e..fb35cf19e 100644 --- a/lib/dl_type_transformer/pyproject.toml +++ b/lib/dl_type_transformer/pyproject.toml @@ -41,6 +41,7 @@ testpaths = [] root_dir = "dl_type_transformer_tests/" target_path = "unit" skip_compose = "true" +labels = ["no_compose"] [tool.mypy] warn_unused_configs = true diff --git a/lib/dl_zitadel/pyproject.toml b/lib/dl_zitadel/pyproject.toml index 1dff35275..fd22fbcbb 100644 --- a/lib/dl_zitadel/pyproject.toml +++ b/lib/dl_zitadel/pyproject.toml @@ -51,6 +51,7 @@ strict_optional = true [datalens.pytest.unit] root_dir = "dl_zitadel_tests/unit" skip_compose = "true" +labels = ["no_compose"] [datalens.pytest.db] root_dir = "dl_zitadel_tests/db"