Merge branch 'ci/rename-packages' into 'master'

ci: rename local idf_ci folder, avoid name collision

See merge request espressif/esp-idf!38756

Author: hfudev

conftest.py

@@ -36,20 +36,23 @@
 from _pytest.fixtures import FixtureRequest
 from artifacts_handler import ArtifactType
 from dynamic_pipelines.constants import TEST_RELATED_APPS_DOWNLOAD_URLS_FILENAME
-from idf_ci.app import import_apps_from_txt
-from idf_ci.uploader import AppDownloader, AppUploader
-from idf_ci_utils import IDF_PATH, idf_relpath
-from idf_pytest.constants import (
-    DEFAULT_SDKCONFIG,
-    ENV_MARKERS,
-    SPECIAL_MARKERS,
-    TARGET_MARKERS,
-    PytestCase,
-    DEFAULT_LOGDIR,
-)
-from idf_pytest.plugin import IDF_PYTEST_EMBEDDED_KEY, ITEM_PYTEST_CASE_KEY, IdfPytestEmbedded
+from idf_ci_local.app import import_apps_from_txt
+from idf_ci_local.uploader import AppDownloader
+from idf_ci_local.uploader import AppUploader
+from idf_ci_utils import IDF_PATH
+from idf_ci_utils import idf_relpath
+from idf_pytest.constants import DEFAULT_LOGDIR
+from idf_pytest.constants import DEFAULT_SDKCONFIG
+from idf_pytest.constants import ENV_MARKERS
+from idf_pytest.constants import SPECIAL_MARKERS
+from idf_pytest.constants import TARGET_MARKERS
+from idf_pytest.constants import PytestCase
+from idf_pytest.plugin import IDF_PYTEST_EMBEDDED_KEY
+from idf_pytest.plugin import ITEM_PYTEST_CASE_KEY
+from idf_pytest.plugin import IdfPytestEmbedded
 from idf_pytest.utils import format_case_id
-from pytest_embedded.plugin import multi_dut_argument, multi_dut_fixture
+from pytest_embedded.plugin import multi_dut_argument
+from pytest_embedded.plugin import multi_dut_fixture
 from pytest_embedded_idf.dut import IdfDut
 from pytest_embedded_idf.unity_tester import CaseTester
 
@@ -426,8 +429,10 @@ def pytest_addoption(parser: pytest.Parser) -> None:
 
 
 def pytest_configure(config: Config) -> None:
-    from pytest_embedded_idf.utils import supported_targets, preview_targets
-    from idf_pytest.constants import SUPPORTED_TARGETS, PREVIEW_TARGETS
+    from idf_pytest.constants import PREVIEW_TARGETS
+    from idf_pytest.constants import SUPPORTED_TARGETS
+    from pytest_embedded_idf.utils import preview_targets
+    from pytest_embedded_idf.utils import supported_targets
 
     supported_targets.set(SUPPORTED_TARGETS)
     preview_targets.set(PREVIEW_TARGETS)

tools/ci/dynamic_pipelines/report.py

@@ -4,13 +4,14 @@
 import sys
 
 import __init__  # noqa: F401 # inject the system path
-from dynamic_pipelines.constants import TEST_RELATED_APPS_FILENAME
 from idf_build_apps import build_apps
 from idf_build_apps import setup_logging
 from idf_build_apps.utils import semicolon_separated_str_to_list
-from idf_ci.app import import_apps_from_txt
+from idf_ci_local.app import import_apps_from_txt
 from idf_pytest.constants import DEFAULT_IGNORE_WARNING_FILEPATH
 
+from dynamic_pipelines.constants import TEST_RELATED_APPS_FILENAME
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Build Apps for Dynamic Pipeline')
     parser.add_argument('app_list_file', default=TEST_RELATED_APPS_FILENAME, help='List of apps to build')

tools/ci/dynamic_pipelines/scripts/child_pipeline_build_apps.py

@@ -1,12 +1,22 @@
 # SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 """This file is used for generating the child pipeline for build jobs."""
+
 import argparse
 import os
 import typing as t
 
 import __init__  # noqa: F401 # inject the system path
 import yaml
+from idf_build_apps.utils import semicolon_separated_str_to_list
+from idf_ci_local.app import dump_apps_to_txt
+from idf_ci_utils import IDF_PATH
+from idf_pytest.constants import DEFAULT_CONFIG_RULES_STR
+from idf_pytest.constants import DEFAULT_FULL_BUILD_TEST_COMPONENTS
+from idf_pytest.constants import DEFAULT_FULL_BUILD_TEST_FILEPATTERNS
+from idf_pytest.constants import CollectMode
+from idf_pytest.script import get_all_apps
+
 from dynamic_pipelines.constants import DEFAULT_APPS_BUILD_PER_JOB
 from dynamic_pipelines.constants import DEFAULT_BUILD_CHILD_PIPELINE_FILEPATH
 from dynamic_pipelines.constants import DEFAULT_BUILD_CHILD_PIPELINE_NAME
@@ -18,14 +28,6 @@
 from dynamic_pipelines.models import BuildJob
 from dynamic_pipelines.models import EmptyJob
 from dynamic_pipelines.utils import dump_jobs_to_yaml
-from idf_build_apps.utils import semicolon_separated_str_to_list
-from idf_ci.app import dump_apps_to_txt
-from idf_ci_utils import IDF_PATH
-from idf_pytest.constants import CollectMode
-from idf_pytest.constants import DEFAULT_CONFIG_RULES_STR
-from idf_pytest.constants import DEFAULT_FULL_BUILD_TEST_COMPONENTS
-from idf_pytest.constants import DEFAULT_FULL_BUILD_TEST_FILEPATTERNS
-from idf_pytest.script import get_all_apps
 
 
 def _separate_str_to_list(s: str) -> t.List[str]:
@@ -101,7 +103,8 @@ def main(arguments: argparse.Namespace) -> None:
         print(f'Generate test related apps file {TEST_RELATED_APPS_FILENAME} with {len(test_related_apps)} apps')
         dump_apps_to_txt(sorted(non_test_related_apps), NON_TEST_RELATED_APPS_FILENAME)
         print(
-            f'Generate non-test related apps file {NON_TEST_RELATED_APPS_FILENAME} with {len(non_test_related_apps)} apps'
+            f'Generate non-test related apps file {NON_TEST_RELATED_APPS_FILENAME} '
+            f'with {len(non_test_related_apps)} apps'
         )
 
         if test_related_apps:
@@ -171,7 +174,7 @@ def main(arguments: argparse.Namespace) -> None:
     parser.add_argument(
         '--compare-manifest-sha-filepath',
         default=os.path.join(IDF_PATH, '.manifest_sha'),
-        help='Path to the recorded manifest sha file generated by `idf-build-apps dump-manifest-sha`'
+        help='Path to the recorded manifest sha file generated by `idf-build-apps dump-manifest-sha`',
     )
     parser.add_argument(
         '--modified-components',

tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py

@@ -6,14 +6,15 @@
 import typing as t
 
 import __init__  # noqa: F401 # inject the system path
+from idf_ci_local.app import enrich_apps_with_metrics_info
+from idf_ci_local.app import import_apps_from_txt
+
 from dynamic_pipelines.report import BuildReportGenerator
 from dynamic_pipelines.report import JobReportGenerator
 from dynamic_pipelines.report import TargetTestReportGenerator
 from dynamic_pipelines.utils import fetch_app_metrics
 from dynamic_pipelines.utils import fetch_failed_jobs
 from dynamic_pipelines.utils import parse_testcases_from_filepattern
-from idf_ci.app import enrich_apps_with_metrics_info
-from idf_ci.app import import_apps_from_txt
 
 
 def main() -> None:

tools/ci/dynamic_pipelines/scripts/generate_report.py

@@ -6,6 +6,7 @@
 2. Post the Build Report if it's running in an MR pipeline.
 3. Generate the child pipeline for target test jobs.
 """
+
 import argparse
 import glob
 import os
@@ -15,24 +16,23 @@
 
 import __init__  # noqa: F401 # inject the system path
 import yaml
+from idf_build_apps import App
+from idf_ci_local.app import import_apps_from_txt
+from idf_pytest.constants import TIMEOUT_4H_MARKERS
+from idf_pytest.script import get_pytest_cases
+
 from dynamic_pipelines.constants import BUILD_ONLY_LABEL
 from dynamic_pipelines.constants import DEFAULT_CASES_TEST_PER_JOB
 from dynamic_pipelines.constants import DEFAULT_TARGET_TEST_CHILD_PIPELINE_FILEPATH
 from dynamic_pipelines.constants import DEFAULT_TARGET_TEST_CHILD_PIPELINE_NAME
 from dynamic_pipelines.constants import DEFAULT_TARGET_TEST_JOB_TEMPLATE_NAME
 from dynamic_pipelines.constants import DEFAULT_TEST_PATHS
-from dynamic_pipelines.constants import (
-    KNOWN_GENERATE_TEST_CHILD_PIPELINE_WARNINGS_FILEPATH,
-)
+from dynamic_pipelines.constants import KNOWN_GENERATE_TEST_CHILD_PIPELINE_WARNINGS_FILEPATH
 from dynamic_pipelines.constants import TIMEOUT_4H_TEMPLATE_NAME
 from dynamic_pipelines.models import EmptyJob
 from dynamic_pipelines.models import Job
 from dynamic_pipelines.models import TargetTestJob
 from dynamic_pipelines.utils import dump_jobs_to_yaml
-from idf_build_apps import App
-from idf_ci.app import import_apps_from_txt
-from idf_pytest.constants import TIMEOUT_4H_MARKERS
-from idf_pytest.script import get_pytest_cases
 
 
 def get_tags_with_amount(s: str) -> t.List[str]: