mirror of
https://github.com/espressif/esp-idf.git
synced 2025-07-29 18:27:20 +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 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
|
||||
|
@ -12,7 +12,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
|
||||
|
@ -1,14 +1,14 @@
|
||||
# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
import argparse
|
||||
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, setup_logging
|
||||
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__':
|
||||
|
@ -18,7 +18,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
|
||||
|
@ -1,13 +1,12 @@
|
||||
# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
import argparse
|
||||
import glob
|
||||
import os
|
||||
|
||||
import __init__ # noqa: F401 # inject the system path
|
||||
from dynamic_pipelines.report import BuildReportGenerator
|
||||
from idf_ci.app import import_apps_from_txt
|
||||
from idf_ci_local.app import import_apps_from_txt
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser(
|
||||
|
@ -27,7 +27,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
|
||||
|
||||
|
||||
|
@ -41,7 +41,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
|
||||
|
@ -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):
|
@ -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
|
||||
|
Reference in New Issue
Block a user