mirror of
https://github.com/espressif/esp-idf.git
synced 2025-07-30 18:57:19 +02:00
ci: rename local idf_ci folder, avoid name collision
This commit is contained in:
@ -36,8 +36,8 @@ from _pytest.config import Config
|
|||||||
from _pytest.fixtures import FixtureRequest
|
from _pytest.fixtures import FixtureRequest
|
||||||
from artifacts_handler import ArtifactType
|
from artifacts_handler import ArtifactType
|
||||||
from dynamic_pipelines.constants import TEST_RELATED_APPS_DOWNLOAD_URLS_FILENAME
|
from dynamic_pipelines.constants import TEST_RELATED_APPS_DOWNLOAD_URLS_FILENAME
|
||||||
from idf_ci.app import import_apps_from_txt
|
from idf_ci_local.app import import_apps_from_txt
|
||||||
from idf_ci.uploader import AppDownloader, AppUploader
|
from idf_ci_local.uploader import AppDownloader, AppUploader
|
||||||
from idf_ci_utils import IDF_PATH, idf_relpath
|
from idf_ci_utils import IDF_PATH, idf_relpath
|
||||||
from idf_pytest.constants import DEFAULT_SDKCONFIG, ENV_MARKERS, SPECIAL_MARKERS, TARGET_MARKERS, PytestCase, \
|
from idf_pytest.constants import DEFAULT_SDKCONFIG, ENV_MARKERS, SPECIAL_MARKERS, TARGET_MARKERS, PytestCase, \
|
||||||
DEFAULT_LOGDIR
|
DEFAULT_LOGDIR
|
||||||
|
@ -15,7 +15,7 @@ from gitlab import GitlabUpdateError
|
|||||||
from gitlab_api import Gitlab
|
from gitlab_api import Gitlab
|
||||||
from idf_build_apps import App
|
from idf_build_apps import App
|
||||||
from idf_build_apps.constants import BuildStatus
|
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 prettytable import PrettyTable
|
||||||
|
|
||||||
from .constants import COMMENT_START_MARKER
|
from .constants import COMMENT_START_MARKER
|
||||||
|
@ -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 build_apps
|
||||||
from idf_build_apps import setup_logging
|
from idf_build_apps import setup_logging
|
||||||
from idf_build_apps.utils import semicolon_separated_str_to_list
|
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 idf_pytest.constants import DEFAULT_IGNORE_WARNING_FILEPATH
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
@ -19,7 +19,7 @@ from dynamic_pipelines.models import BuildJob
|
|||||||
from dynamic_pipelines.models import EmptyJob
|
from dynamic_pipelines.models import EmptyJob
|
||||||
from dynamic_pipelines.utils import dump_jobs_to_yaml
|
from dynamic_pipelines.utils import dump_jobs_to_yaml
|
||||||
from idf_build_apps.utils import semicolon_separated_str_to_list
|
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_ci_utils import IDF_PATH
|
||||||
from idf_pytest.constants import CollectMode
|
from idf_pytest.constants import CollectMode
|
||||||
from idf_pytest.constants import DEFAULT_CONFIG_RULES_STR
|
from idf_pytest.constants import DEFAULT_CONFIG_RULES_STR
|
||||||
|
@ -11,7 +11,7 @@ from dynamic_pipelines.report import JobReportGenerator
|
|||||||
from dynamic_pipelines.report import TargetTestReportGenerator
|
from dynamic_pipelines.report import TargetTestReportGenerator
|
||||||
from dynamic_pipelines.utils import fetch_failed_jobs
|
from dynamic_pipelines.utils import fetch_failed_jobs
|
||||||
from dynamic_pipelines.utils import parse_testcases_from_filepattern
|
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:
|
def main() -> None:
|
||||||
|
@ -28,7 +28,7 @@ from dynamic_pipelines.models import Job
|
|||||||
from dynamic_pipelines.models import TargetTestJob
|
from dynamic_pipelines.models import TargetTestJob
|
||||||
from dynamic_pipelines.utils import dump_jobs_to_yaml
|
from dynamic_pipelines.utils import dump_jobs_to_yaml
|
||||||
from idf_build_apps import App
|
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
|
from idf_pytest.script import get_pytest_cases
|
||||||
|
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ tools/ci/get_known_failure_cases_file.py
|
|||||||
tools/unit-test-app/**/*
|
tools/unit-test-app/**/*
|
||||||
tools/ci/gitlab_yaml_linter.py
|
tools/ci/gitlab_yaml_linter.py
|
||||||
tools/ci/dynamic_pipelines/**/*
|
tools/ci/dynamic_pipelines/**/*
|
||||||
tools/ci/idf_ci/**/*
|
tools/ci/idf_ci_local/**/*
|
||||||
tools/ci/get_supported_examples.sh
|
tools/ci/get_supported_examples.sh
|
||||||
tools/ci/python_packages/common_test_methods.py
|
tools/ci/python_packages/common_test_methods.py
|
||||||
tools/ci/python_packages/gitlab_api.py
|
tools/ci/python_packages/gitlab_api.py
|
||||||
|
@ -8,8 +8,8 @@ from typing import Literal
|
|||||||
from idf_build_apps import App
|
from idf_build_apps import App
|
||||||
from idf_build_apps import CMakeApp
|
from idf_build_apps import CMakeApp
|
||||||
from idf_build_apps import json_to_app
|
from idf_build_apps import json_to_app
|
||||||
from idf_ci.uploader import AppUploader
|
from idf_ci_local.uploader import AppUploader
|
||||||
from idf_ci.uploader import get_app_uploader
|
from idf_ci_local.uploader import get_app_uploader
|
||||||
|
|
||||||
|
|
||||||
class IdfCMakeApp(CMakeApp):
|
class IdfCMakeApp(CMakeApp):
|
@ -14,7 +14,7 @@ from idf_build_apps import App
|
|||||||
from idf_build_apps import find_apps
|
from idf_build_apps import find_apps
|
||||||
from idf_build_apps.constants import BuildStatus
|
from idf_build_apps.constants import BuildStatus
|
||||||
from idf_build_apps.constants import SUPPORTED_TARGETS
|
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 get_all_manifest_files
|
||||||
from idf_ci_utils import IDF_PATH
|
from idf_ci_utils import IDF_PATH
|
||||||
from idf_ci_utils import idf_relpath
|
from idf_ci_utils import idf_relpath
|
||||||
|
Reference in New Issue
Block a user