From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 20 Feb 2020 16:59:27 +0000 (+0100)
Subject: packaging: remove zypper repo kludge
X-Git-Tag: 1.1.0~151^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1415%2Fhead;p=teuthology.git

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 <ncutler@suse.com>
---

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index 7b7d0adb6..b72d8d6e8 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),