From 0c5c1e3b5b49117f96f0fc9d0771e98f756f841b Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 20 Feb 2020 17:59:27 +0100 Subject: [PATCH] packaging: remove zypper repo kludge Now that https://github.com/ceph/chacra/pull/275 has been merged and deployed, we can write this code without any kludge. Signed-off-by: Nathan Cutler --- teuthology/packaging.py | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/teuthology/packaging.py b/teuthology/packaging.py index 7b7d0adb6d..b72d8d6e8f 100644 --- a/teuthology/packaging.py +++ b/teuthology/packaging.py @@ -976,32 +976,14 @@ class ShamanProject(GitbuilderProject): dist_release = self.dist_release repo = self._get_repo() if dist_release in ['opensuse', 'sle']: - # - # Shaman does not currently return opensuse repos in a format that zypper - # understands -- see https://tracker.ceph.com/issues/44183 for details. - # - # So, do some text manipulation to convert the yum-style repo to - # zypper-style. - # - # This text manipulation/conversion code should continue to work even - # after Shaman is fixed. - # - munged_repo = '' - repo_lines = repo.splitlines() - for repo_line in repo_lines: - if repo_line.startswith('baseurl='): - if repo_line.endswith('$basearch'): - repo_line = repo_line[:-len('$basearch')] - if repo_line == '': - break - munged_repo += str(repo_line) + '\n' - log.info("Writing zypper repo: {}".format(munged_repo)) + log.info("Writing zypper repo:\n{}".format(repo)) sudo_write_file( self.remote, '/etc/zypp/repos.d/{proj}.repo'.format(proj=self.project), - munged_repo, + repo, ) else: + log.info("Writing yum repo:\n{}".format(repo)) sudo_write_file( self.remote, '/etc/yum.repos.d/{proj}.repo'.format(proj=self.project), -- 2.39.5