diff --git a/tools/download_and_deploy/src/component_install/devkitweb_deploy.py b/tools/download_and_deploy/src/component_install/devkitweb_deploy.py index 8cf7ba1ee29b28584c028b61d617b23d43efed35..d244a0e42345170b4c0bb4f2ea09f7e1f21013aa 100644 --- a/tools/download_and_deploy/src/component_install/devkitweb_deploy.py +++ b/tools/download_and_deploy/src/component_install/devkitweb_deploy.py @@ -27,7 +27,13 @@ class DevkitWebDeploy(DeployBase): f"remote_file: {remote_file}") # cls.remote_file_list.append(remote_file) - sftp_client.put(localpath=f"{local_file}", remotepath=f"{remote_file}") + try: + sftp_client.put(localpath=f"{local_file}", remotepath=f"{remote_file}") + except Exception as e: + devkitweb_prompt = f"Remote machine copy {cls.component_name} failed. " \ + f"Please check /opt write permission and /opt/DevKit-All-24.0.RC1-Linux-Kunpeng.tar.gz exists." + LOGGER.error(devkitweb_prompt) + raise IOError(devkitweb_prompt) @classmethod def install(cls, machine, sftp_client, ssh_client): diff --git a/tools/download_and_deploy/src/download/download_config.py b/tools/download_and_deploy/src/download/download_config.py index 207a83089354253d8af46b38b812b890b8c1b5d4..cc1c7f69f53631221b1e127573c7b0a76764526e 100644 --- a/tools/download_and_deploy/src/download/download_config.py +++ b/tools/download_and_deploy/src/download/download_config.py @@ -21,7 +21,7 @@ BiShengJDK17 = { CompatibilityTesting = { "component_name": "CompatibilityTesting", - "file": "https://gitee.com/bdgl/devkit-pipeline/releases/download/compatibility_testing-v1.2/compatibility_testing.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.1/compatibility_testing.tar.gz", "file_size": "76451308", } diff --git a/tools/download_and_deploy/src/download_main.py b/tools/download_and_deploy/src/download_main.py index d577f786e2d8a86eddd6fa37e3d8fd7398e398c6..8fe76cb9da3cb10b4b04f48d6bc2a24932637944 100644 --- a/tools/download_and_deploy/src/download_main.py +++ b/tools/download_and_deploy/src/download_main.py @@ -20,11 +20,9 @@ PIPELINE = [BaseCheck(), GatherPackage(), CompressDep()] iso_collection_map = { component.get("component_name"): { - "download file": { - URL: f"{component.get(FILE)}", - SAVE_PATH: f"{os.path.join('./', component.get(FILE).split('/')[-1])}", - FILE_SIZE: f"{component.get(FILE_SIZE)}", - }, + URL: f"{component.get(FILE)}", + SAVE_PATH: f"{os.path.join('./', component.get(FILE).split('/')[-1])}", + FILE_SIZE: f"{component.get(FILE_SIZE)}", } for component in ( download_config.OpenEuler_2003_LTS, download_config.OpenEuler_2003_LTS_SP1, @@ -65,11 +63,11 @@ def download_iso(): .replace("-", "_")) print(f"Auto detect operating system version: {CommandLine.download_iso}") - shell_dict = iso_collection_map.get(CommandLine.download_iso, "") - if not shell_dict: + url_and_save_path = iso_collection_map.get(CommandLine.download_iso, "") + if not url_and_save_path: print("Please check /etc/os-release is changed or not.") return False - return download_dependence_file("download file", shell_dict) + return download_dependence_file(url_and_save_path) if __name__ == '__main__':