diff --git a/common/common.py b/common/common.py index 098ca4ff9123b1d9fceb04136eedc98782430272..cee8874cb6de091a5aea4ad6f388ba37cec4861d 100644 --- a/common/common.py +++ b/common/common.py @@ -82,20 +82,22 @@ class Pexpect(object): if ret == 3 or ret == 4: break - def ssh_cmd(self, cmd, timeout=120): + def ssh_cmd(self, cmd, timeout=600): """ cmd: command will be runnd return: response of command """ - if self.port: - cmd = "ssh -p %s %s@%s '%s'" % (self.port, self.user, self.ip, cmd) - else: - cmd = "ssh %s@%s '%s'" % (self.user, self.ip, cmd) - process = pexpect.spawn(cmd, timeout=timeout) - self._expect(process) - msg = process.readlines() - process.close() - + try: + if self.port: + cmd = "ssh -p %s %s@%s '%s'" % (self.port, self.user, self.ip, cmd) + else: + cmd = "ssh %s@%s '%s'" % (self.user, self.ip, cmd) + process = pexpect.spawn(cmd, timeout=timeout) + self._expect(process) + msg = process.readlines() + process.close() + except pexpect.exceptions.TIMEOUT as e: + return e return msg def scp_file(self, src_file, dest_dir): @@ -118,8 +120,9 @@ class Pexpect(object): if __name__ == "__main__": res = git_repo_src("https://gitee.com/src-openeuler/zip", "xxxxx", "xxxxx") print(res) - test = Pexpect("root", "127.0.0.1", "123456", port=2224) - res = test.ssh_cmd("pwd") + test = Pexpect("root", "127.0.0.1", "112233") #, port=2224) + res = test.ssh_cmd("osc getbinareis openEuler:20.03:LTS:Next ceph standard_x86_64 x86_64") + print("..................") print(res) res = test.scp_file("./ip.txt", "~") print(res) diff --git a/core/update_obs_repos.py b/core/update_obs_repos.py index d1daa954a36c0929be92fb768d6c3c8207fe9b2e..5104f52903d79e09805d53b51e595e6c6150508f 100755 --- a/core/update_obs_repos.py +++ b/core/update_obs_repos.py @@ -164,7 +164,7 @@ class RPMManager(object): log.debug(rpms_list) self.old_pkg_rpms[pkg] = rpms_list for r in rpms_list: - cmd = "rsync -avz --progress %s/%s/%s/%s/%s/%s %s/%s/%s/:full/" \ + cmd = "cp %s/%s/%s/%s/%s/%s %s/%s/%s/:full/" \ % (self.obs_project_root_path, self.obs_project, self.repo, \ self.arch, pkg, r, self.obs_project_root_path, \ self.rpms_to_repo_path, self.arch)