From 64f8854983e3ea5f3cde67db4f6555495cc81012 Mon Sep 17 00:00:00 2001 From: zoupanpan Date: Mon, 18 Mar 2024 21:01:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 2 -- .../common => common}/devkit_utils/__init__.py | 0 .../devkit_utils/devkit_client.py | 0 .../common => common}/devkit_utils/error_coce.py | 0 .../common => common}/devkit_utils/file_utils.py | 0 .../common => common}/devkit_utils/log_config.py | 0 .../devkit_utils/pyinstaller_utils.py | 0 .../devkit_utils/shell_tools.py | 0 .../devkit_utils/transport_utils.py | 0 .../DevkitDistribute}/build_devkit_distribute.sh | 9 ++++++--- .../devkit_distribute/bin/entrance.py | 0 .../devkit_distribute/bin/report/__init__.py | 0 .../devkit_distribute/bin/report/report.py | 0 .../bin/report/template/__init__.py | 0 .../bin/report/template/chart_template.py | 0 .../bin/report/template/git_log_template.py | 0 .../bin/report/template/performance_template.py | 0 .../bin/report/template/summary_template.py | 0 .../config/devkit_distribute_template.yaml | 0 .../devkit_distribute/config/log.ini.template | 0 .../devkit_distribute/config/perf_report.html | 0 .../script/generate_lkptest_config.sh | 0 .../devkit_distribute/script/start.sh | 0 .../bin/flight_records_sample.py | 0 .../config/complete_the_upload.ini | 0 .../config/log.ini.template | 0 .../devkit_pipeline_agent/config/settings.jfc | 0 .../config/upload_sample.ini | 0 .../script/devkit_agent_start.sh | 0 component/build_component.sh | 16 +++++++++------- 30 files changed, 15 insertions(+), 12 deletions(-) rename {tools/common => common}/devkit_utils/__init__.py (100%) rename {tools/common => common}/devkit_utils/devkit_client.py (100%) rename {tools/common => common}/devkit_utils/error_coce.py (100%) rename {tools/common => common}/devkit_utils/file_utils.py (100%) rename {tools/common => common}/devkit_utils/log_config.py (100%) rename {tools/common => common}/devkit_utils/pyinstaller_utils.py (100%) rename {tools/common => common}/devkit_utils/shell_tools.py (100%) rename {tools/common => common}/devkit_utils/transport_utils.py (100%) rename {tools/distribute => component/DevkitDistribute}/build_devkit_distribute.sh (79%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/bin/entrance.py (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/bin/report/__init__.py (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/bin/report/report.py (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/bin/report/template/__init__.py (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/bin/report/template/chart_template.py (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/bin/report/template/git_log_template.py (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/bin/report/template/performance_template.py (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/bin/report/template/summary_template.py (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/config/devkit_distribute_template.yaml (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/config/log.ini.template (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/config/perf_report.html (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/script/generate_lkptest_config.sh (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_distribute/script/start.sh (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_pipeline_agent/bin/flight_records_sample.py (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_pipeline_agent/config/complete_the_upload.ini (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_pipeline_agent/config/log.ini.template (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_pipeline_agent/config/settings.jfc (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_pipeline_agent/config/upload_sample.ini (100%) rename {tools/distribute => component/DevkitDistribute}/devkit_pipeline_agent/script/devkit_agent_start.sh (100%) diff --git a/build.sh b/build.sh index 8bbb6cd..0bec869 100644 --- a/build.sh +++ b/build.sh @@ -14,8 +14,6 @@ if [[ "$?" -ne "0" ]]; then exit 1 fi -bash "${current_dir}"/tools/distribute/build_devkit_distribute.sh - bash "${current_dir}"/tools/download_dependency/build_download.sh bash "${current_dir}"/tools/install_dependency/build_install.sh diff --git a/tools/common/devkit_utils/__init__.py b/common/devkit_utils/__init__.py similarity index 100% rename from tools/common/devkit_utils/__init__.py rename to common/devkit_utils/__init__.py diff --git a/tools/common/devkit_utils/devkit_client.py b/common/devkit_utils/devkit_client.py similarity index 100% rename from tools/common/devkit_utils/devkit_client.py rename to common/devkit_utils/devkit_client.py diff --git a/tools/common/devkit_utils/error_coce.py b/common/devkit_utils/error_coce.py similarity index 100% rename from tools/common/devkit_utils/error_coce.py rename to common/devkit_utils/error_coce.py diff --git a/tools/common/devkit_utils/file_utils.py b/common/devkit_utils/file_utils.py similarity index 100% rename from tools/common/devkit_utils/file_utils.py rename to common/devkit_utils/file_utils.py diff --git a/tools/common/devkit_utils/log_config.py b/common/devkit_utils/log_config.py similarity index 100% rename from tools/common/devkit_utils/log_config.py rename to common/devkit_utils/log_config.py diff --git a/tools/common/devkit_utils/pyinstaller_utils.py b/common/devkit_utils/pyinstaller_utils.py similarity index 100% rename from tools/common/devkit_utils/pyinstaller_utils.py rename to common/devkit_utils/pyinstaller_utils.py diff --git a/tools/common/devkit_utils/shell_tools.py b/common/devkit_utils/shell_tools.py similarity index 100% rename from tools/common/devkit_utils/shell_tools.py rename to common/devkit_utils/shell_tools.py diff --git a/tools/common/devkit_utils/transport_utils.py b/common/devkit_utils/transport_utils.py similarity index 100% rename from tools/common/devkit_utils/transport_utils.py rename to common/devkit_utils/transport_utils.py diff --git a/tools/distribute/build_devkit_distribute.sh b/component/DevkitDistribute/build_devkit_distribute.sh similarity index 79% rename from tools/distribute/build_devkit_distribute.sh rename to component/DevkitDistribute/build_devkit_distribute.sh index 6bf2759..e0bbca5 100644 --- a/tools/distribute/build_devkit_distribute.sh +++ b/component/DevkitDistribute/build_devkit_distribute.sh @@ -14,7 +14,7 @@ mkdir -p "${build_dir}" cd "${build_dir}" pyinstaller -F "${current_dir}"/devkit_pipeline_agent/bin/flight_records_sample.py --runtime-tmpdir . \ - -p "${project_dir}"/tools/common + -p "${project_dir}"/common mkdir -p devkit_pipeline_agent/bin mkdir -p devkit_pipeline_agent/data @@ -28,7 +28,7 @@ tar -czf devkit_pipeline_agent.tar.gz devkit_pipeline_agent pyinstaller -F "${current_dir}"/devkit_distribute/bin/entrance.py --runtime-tmpdir . \ - -p "${project_dir}"/tools/common + -p "${project_dir}"/common mkdir -p devkit_distribute/bin mkdir -p devkit_distribute/data @@ -42,4 +42,7 @@ cp devkit_pipeline_agent.tar.gz devkit_distribute/config tar -czf devkit_distribute.tar.gz devkit_distribute -/bin/cp -rf devkit_distribute.tar.gz "${project_dir}"/build/component/DevkitDistribute +mkdir -p "${project_dir}"/build/component/DevkitDistribute +cp devkit_distribute.tar.gz "${project_dir}"/build/component/DevkitDistribute +cp "${current_dir}/check_install_result.sh" "${project_dir}"/build/component/DevkitDistribute +cp "${current_dir}/install.sh" "${project_dir}"/build/component/DevkitDistribute diff --git a/tools/distribute/devkit_distribute/bin/entrance.py b/component/DevkitDistribute/devkit_distribute/bin/entrance.py similarity index 100% rename from tools/distribute/devkit_distribute/bin/entrance.py rename to component/DevkitDistribute/devkit_distribute/bin/entrance.py diff --git a/tools/distribute/devkit_distribute/bin/report/__init__.py b/component/DevkitDistribute/devkit_distribute/bin/report/__init__.py similarity index 100% rename from tools/distribute/devkit_distribute/bin/report/__init__.py rename to component/DevkitDistribute/devkit_distribute/bin/report/__init__.py diff --git a/tools/distribute/devkit_distribute/bin/report/report.py b/component/DevkitDistribute/devkit_distribute/bin/report/report.py similarity index 100% rename from tools/distribute/devkit_distribute/bin/report/report.py rename to component/DevkitDistribute/devkit_distribute/bin/report/report.py diff --git a/tools/distribute/devkit_distribute/bin/report/template/__init__.py b/component/DevkitDistribute/devkit_distribute/bin/report/template/__init__.py similarity index 100% rename from tools/distribute/devkit_distribute/bin/report/template/__init__.py rename to component/DevkitDistribute/devkit_distribute/bin/report/template/__init__.py diff --git a/tools/distribute/devkit_distribute/bin/report/template/chart_template.py b/component/DevkitDistribute/devkit_distribute/bin/report/template/chart_template.py similarity index 100% rename from tools/distribute/devkit_distribute/bin/report/template/chart_template.py rename to component/DevkitDistribute/devkit_distribute/bin/report/template/chart_template.py diff --git a/tools/distribute/devkit_distribute/bin/report/template/git_log_template.py b/component/DevkitDistribute/devkit_distribute/bin/report/template/git_log_template.py similarity index 100% rename from tools/distribute/devkit_distribute/bin/report/template/git_log_template.py rename to component/DevkitDistribute/devkit_distribute/bin/report/template/git_log_template.py diff --git a/tools/distribute/devkit_distribute/bin/report/template/performance_template.py b/component/DevkitDistribute/devkit_distribute/bin/report/template/performance_template.py similarity index 100% rename from tools/distribute/devkit_distribute/bin/report/template/performance_template.py rename to component/DevkitDistribute/devkit_distribute/bin/report/template/performance_template.py diff --git a/tools/distribute/devkit_distribute/bin/report/template/summary_template.py b/component/DevkitDistribute/devkit_distribute/bin/report/template/summary_template.py similarity index 100% rename from tools/distribute/devkit_distribute/bin/report/template/summary_template.py rename to component/DevkitDistribute/devkit_distribute/bin/report/template/summary_template.py diff --git a/tools/distribute/devkit_distribute/config/devkit_distribute_template.yaml b/component/DevkitDistribute/devkit_distribute/config/devkit_distribute_template.yaml similarity index 100% rename from tools/distribute/devkit_distribute/config/devkit_distribute_template.yaml rename to component/DevkitDistribute/devkit_distribute/config/devkit_distribute_template.yaml diff --git a/tools/distribute/devkit_distribute/config/log.ini.template b/component/DevkitDistribute/devkit_distribute/config/log.ini.template similarity index 100% rename from tools/distribute/devkit_distribute/config/log.ini.template rename to component/DevkitDistribute/devkit_distribute/config/log.ini.template diff --git a/tools/distribute/devkit_distribute/config/perf_report.html b/component/DevkitDistribute/devkit_distribute/config/perf_report.html similarity index 100% rename from tools/distribute/devkit_distribute/config/perf_report.html rename to component/DevkitDistribute/devkit_distribute/config/perf_report.html diff --git a/tools/distribute/devkit_distribute/script/generate_lkptest_config.sh b/component/DevkitDistribute/devkit_distribute/script/generate_lkptest_config.sh similarity index 100% rename from tools/distribute/devkit_distribute/script/generate_lkptest_config.sh rename to component/DevkitDistribute/devkit_distribute/script/generate_lkptest_config.sh diff --git a/tools/distribute/devkit_distribute/script/start.sh b/component/DevkitDistribute/devkit_distribute/script/start.sh similarity index 100% rename from tools/distribute/devkit_distribute/script/start.sh rename to component/DevkitDistribute/devkit_distribute/script/start.sh diff --git a/tools/distribute/devkit_pipeline_agent/bin/flight_records_sample.py b/component/DevkitDistribute/devkit_pipeline_agent/bin/flight_records_sample.py similarity index 100% rename from tools/distribute/devkit_pipeline_agent/bin/flight_records_sample.py rename to component/DevkitDistribute/devkit_pipeline_agent/bin/flight_records_sample.py diff --git a/tools/distribute/devkit_pipeline_agent/config/complete_the_upload.ini b/component/DevkitDistribute/devkit_pipeline_agent/config/complete_the_upload.ini similarity index 100% rename from tools/distribute/devkit_pipeline_agent/config/complete_the_upload.ini rename to component/DevkitDistribute/devkit_pipeline_agent/config/complete_the_upload.ini diff --git a/tools/distribute/devkit_pipeline_agent/config/log.ini.template b/component/DevkitDistribute/devkit_pipeline_agent/config/log.ini.template similarity index 100% rename from tools/distribute/devkit_pipeline_agent/config/log.ini.template rename to component/DevkitDistribute/devkit_pipeline_agent/config/log.ini.template diff --git a/tools/distribute/devkit_pipeline_agent/config/settings.jfc b/component/DevkitDistribute/devkit_pipeline_agent/config/settings.jfc similarity index 100% rename from tools/distribute/devkit_pipeline_agent/config/settings.jfc rename to component/DevkitDistribute/devkit_pipeline_agent/config/settings.jfc diff --git a/tools/distribute/devkit_pipeline_agent/config/upload_sample.ini b/component/DevkitDistribute/devkit_pipeline_agent/config/upload_sample.ini similarity index 100% rename from tools/distribute/devkit_pipeline_agent/config/upload_sample.ini rename to component/DevkitDistribute/devkit_pipeline_agent/config/upload_sample.ini diff --git a/tools/distribute/devkit_pipeline_agent/script/devkit_agent_start.sh b/component/DevkitDistribute/devkit_pipeline_agent/script/devkit_agent_start.sh similarity index 100% rename from tools/distribute/devkit_pipeline_agent/script/devkit_agent_start.sh rename to component/DevkitDistribute/devkit_pipeline_agent/script/devkit_agent_start.sh diff --git a/component/build_component.sh b/component/build_component.sh index 5d83c27..74c82c3 100644 --- a/component/build_component.sh +++ b/component/build_component.sh @@ -12,32 +12,34 @@ umask 077 function build_lkp_tests() { # 单独处理LkpTests - mkdir -p ${final_component_dir}/LkpTests - bash ${current_dir}/LkpTests/build_lkp_tests_all.sh ${final_component_dir}/LkpTests + mkdir -p "${final_component_dir}"/LkpTests + bash "${current_dir}"/LkpTests/build_lkp_tests_all.sh "${final_component_dir}"/LkpTests if [[ "$?" -ne "0" ]]; then exit 1 fi - cp -rf ${current_dir}/LkpTests/install.sh ${final_component_dir}/LkpTests - cp -rf ${current_dir}/LkpTests/check_install_result.sh ${final_component_dir}/LkpTests + cp -rf "${current_dir}"/LkpTests/install.sh "${final_component_dir}"/LkpTests + cp -rf "${current_dir}"/LkpTests/check_install_result.sh "${final_component_dir}"/LkpTests } function main() { if [[ -d ${final_component_dir} ]]; then - rm -rf ${final_component_dir} + rm -rf "${final_component_dir}" fi - mkdir -p ${final_component_dir} + mkdir -p "${final_component_dir}" component_arrays=( - "BiShengCompiler" "BiShengJDK8" "BiShengJDK17" "GCCforOpenEuler" "OpenEulerMirrorISO" "CompatibilityTesting" "DevkitDistribute" "CloudTest" + "BiShengCompiler" "BiShengJDK8" "BiShengJDK17" "GCCforOpenEuler" "OpenEulerMirrorISO" "CompatibilityTesting" "CloudTest" ) for element in "${component_arrays[@]}"; do cp -rf "${current_dir}/${element}" "${final_component_dir}" done build_lkp_tests + + bash "${current_dir}"/DevkitDistribute/build_devkit_distribute.sh } main "$@" -- Gitee