From d678a7d078b90d9c6d8c426c73abef9b76a0b18f Mon Sep 17 00:00:00 2001 From: cc <18856836718@163.com> Date: Mon, 4 Mar 2024 10:56:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3ip=E8=B6=85=E6=97=B6=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 9 --------- README.md | 18 ++++-------------- .../install_dependency/src/machine/machine.py | 8 ++++---- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/README.en.md b/README.en.md index fc0c63a..cd5426d 100644 --- a/README.en.md +++ b/README.en.md @@ -25,12 +25,3 @@ Software architecture description 3. Commit your code 4. Create Pull Request - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 72b0be0..e1a2379 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ Pipeline solution to support building, deploying and automating any software pro #### 使用说明 -1. 下载工具和部署工具使用文档 https://gitee.com/openeuler/devkit-pipeline/blob/master/document/%E6%89%B9%E9%87%8F%E9%83%A8%E7%BD%B2%E5%B7%A5%E5%85%B7/%E6%89%B9%E9%87%8F%E9%83%A8%E7%BD%B2%E5%B7%A5%E5%85%B7devkitpipeline.md -2. Jenkins部署和配置说明 https://gitee.com/openeuler/devkit-pipeline/tree/master/document/Jenkins%E5%AE%89%E8%A3%85%E9%83%A8%E7%BD%B2 -3. Gitlab部署和配置说明 https://gitee.com/openeuler/devkit-pipeline/tree/master/document/gitlab%E5%AE%89%E8%A3%85%E9%83%A8%E7%BD%B2 -4. lkp-test手动部署说明 https://gitee.com/openeuler/devkit-pipeline/tree/master/document/lkp-test%E5%AE%89%E8%A3%85%E9%83%A8%E7%BD%B2 +1. [下载工具和部署工具使用文档](https://gitee.com/openeuler/devkit-pipeline/blob/master/document/批量部署工具/批量部署工具devkitpipeline.md) +2. [安装部署Jenkins](https://gitee.com/openeuler/devkit-pipeline/blob/master/document/Jenkins安装部署/安装部署Jenkins.md) +3. [安装部署Gitlab](https://gitee.com/openeuler/devkit-pipeline/blob/master/document/gitlab安装部署/gitlab安装部署.md) +4. [手动安装lkp-test](https://gitee.com/openeuler/devkit-pipeline/blob/master/document/lkp-test安装部署/lkp-tests安装部署.md) #### 参与贡献 @@ -19,13 +19,3 @@ Pipeline solution to support building, deploying and automating any software pro 2. 新建 Feat_xxx 分支 3. 提交代码 4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/tools/install_dependency/src/machine/machine.py b/tools/install_dependency/src/machine/machine.py index 73e31ac..0660369 100644 --- a/tools/install_dependency/src/machine/machine.py +++ b/tools/install_dependency/src/machine/machine.py @@ -63,10 +63,8 @@ class Machine: LOGGER.error(f"Connect remote {self.ip} failed because of wrong pkey. {str(e)}") raise CreatePkeyFailedException() - transport = paramiko.Transport((self.ip, 22)) - try: - self.transport_connect_with_timeout(transport, user, pkey) + transport = self.transport_connect_with_timeout(user, pkey) except (paramiko.ssh_exception.AuthenticationException, paramiko.ssh_exception.SSHException, timeout_decorator.TimeoutError, @@ -78,8 +76,10 @@ class Machine: return transport @timeout_decorator.timeout(10) - def transport_connect_with_timeout(self, transport, user, pkey): + def transport_connect_with_timeout(self, user, pkey): + transport = paramiko.Transport((self.ip, 22)) transport.connect(username=user, pkey=pkey) + return transport def install_component(self, component_name): ssh_client = self.ssh_client() -- Gitee