diff --git a/conftest.py b/conftest.py index ec028e6645..17fa2b8936 100644 --- a/conftest.py +++ b/conftest.py @@ -36,8 +36,8 @@ from _pytest.config import Config 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_local.app import import_apps_from_txt +from idf_ci_local.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 diff --git a/tools/ci/dynamic_pipelines/report.py b/tools/ci/dynamic_pipelines/report.py index ca41156462..153f1071c3 100644 --- a/tools/ci/dynamic_pipelines/report.py +++ b/tools/ci/dynamic_pipelines/report.py @@ -15,7 +15,7 @@ from gitlab import GitlabUpdateError from gitlab_api import Gitlab from idf_build_apps import App from idf_build_apps.constants import BuildStatus -from idf_ci.uploader import AppUploader +from idf_ci_local.uploader import AppUploader from prettytable import PrettyTable from .constants import COMMENT_START_MARKER diff --git a/tools/ci/dynamic_pipelines/scripts/child_pipeline_build_apps.py b/tools/ci/dynamic_pipelines/scripts/child_pipeline_build_apps.py index a76631f702..8a247e8f51 100644 --- a/tools/ci/dynamic_pipelines/scripts/child_pipeline_build_apps.py +++ b/tools/ci/dynamic_pipelines/scripts/child_pipeline_build_apps.py @@ -8,7 +8,7 @@ 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 if __name__ == '__main__': diff --git a/tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py b/tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py index b0e9644ee2..f7bb2c793d 100644 --- a/tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py +++ b/tools/ci/dynamic_pipelines/scripts/generate_build_child_pipeline.py @@ -19,7 +19,7 @@ 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_local.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 diff --git a/tools/ci/dynamic_pipelines/scripts/generate_report.py b/tools/ci/dynamic_pipelines/scripts/generate_report.py index 43e5ecab8a..b769c93481 100644 --- a/tools/ci/dynamic_pipelines/scripts/generate_report.py +++ b/tools/ci/dynamic_pipelines/scripts/generate_report.py @@ -11,7 +11,7 @@ from dynamic_pipelines.report import JobReportGenerator from dynamic_pipelines.report import TargetTestReportGenerator from dynamic_pipelines.utils import fetch_failed_jobs from dynamic_pipelines.utils import parse_testcases_from_filepattern -from idf_ci.app import import_apps_from_txt +from idf_ci_local.app import import_apps_from_txt def main() -> None: diff --git a/tools/ci/dynamic_pipelines/scripts/generate_target_test_child_pipeline.py b/tools/ci/dynamic_pipelines/scripts/generate_target_test_child_pipeline.py index 019bc789a6..54fffd1d0b 100644 --- a/tools/ci/dynamic_pipelines/scripts/generate_target_test_child_pipeline.py +++ b/tools/ci/dynamic_pipelines/scripts/generate_target_test_child_pipeline.py @@ -28,7 +28,7 @@ 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_ci_local.app import import_apps_from_txt from idf_pytest.script import get_pytest_cases diff --git a/tools/ci/exclude_check_tools_files.txt b/tools/ci/exclude_check_tools_files.txt index 5febcfec8e..26363dd58d 100644 --- a/tools/ci/exclude_check_tools_files.txt +++ b/tools/ci/exclude_check_tools_files.txt @@ -44,7 +44,7 @@ tools/ci/get_known_failure_cases_file.py tools/unit-test-app/**/* tools/ci/gitlab_yaml_linter.py tools/ci/dynamic_pipelines/**/* -tools/ci/idf_ci/**/* +tools/ci/idf_ci_local/**/* tools/ci/get_supported_examples.sh tools/ci/python_packages/common_test_methods.py tools/ci/python_packages/gitlab_api.py diff --git a/tools/ci/idf_ci/__init__.py b/tools/ci/idf_ci_local/__init__.py similarity index 100% rename from tools/ci/idf_ci/__init__.py rename to tools/ci/idf_ci_local/__init__.py diff --git a/tools/ci/idf_ci/app.py b/tools/ci/idf_ci_local/app.py similarity index 93% rename from tools/ci/idf_ci/app.py rename to tools/ci/idf_ci_local/app.py index 03bdb7d9d6..4dd91153d3 100644 --- a/tools/ci/idf_ci/app.py +++ b/tools/ci/idf_ci_local/app.py @@ -8,8 +8,8 @@ from typing import Literal from idf_build_apps import App from idf_build_apps import CMakeApp from idf_build_apps import json_to_app -from idf_ci.uploader import AppUploader -from idf_ci.uploader import get_app_uploader +from idf_ci_local.uploader import AppUploader +from idf_ci_local.uploader import get_app_uploader class IdfCMakeApp(CMakeApp): diff --git a/tools/ci/idf_ci/uploader.py b/tools/ci/idf_ci_local/uploader.py similarity index 100% rename from tools/ci/idf_ci/uploader.py rename to tools/ci/idf_ci_local/uploader.py diff --git a/tools/ci/idf_pytest/script.py b/tools/ci/idf_pytest/script.py index 0ff8b5e14f..9c53748699 100644 --- a/tools/ci/idf_pytest/script.py +++ b/tools/ci/idf_pytest/script.py @@ -14,7 +14,7 @@ from idf_build_apps import App from idf_build_apps import find_apps from idf_build_apps.constants import BuildStatus from idf_build_apps.constants import SUPPORTED_TARGETS -from idf_ci.app import IdfCMakeApp +from idf_ci_local.app import IdfCMakeApp from idf_ci_utils import get_all_manifest_files from idf_ci_utils import IDF_PATH from idf_ci_utils import idf_relpath