ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 20:01:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix copr integration tests (#3237) (#3324)

Browse source 
Fixes: #2084
(cherry picked from commit 7c493eb4e5)

Co-authored-by: Silvie Chlupova <33493796+schlupov@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2021-09-02 06:30:01 +02:00 • committed by GitHub
parent de602a9b93
commit 3735ee6df7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/modules/packaging/os/copr.py
View file

@ -120,8 +120,7 @@ class CoprModule(object):
@property
def short_chroot(self):
"""str: Chroot (distribution-version-architecture) shorten to distribution-version."""
chroot_parts = self.chroot.split("-")
return "{0}-{1}".format(chroot_parts[0], chroot_parts[1])
return self.chroot.rsplit('-', 1)[0]
@property
def arch(self):
@ -193,18 +192,20 @@ class CoprModule(object):
Returns:
Information about the repository.
"""
distribution, version = self.short_chroot.split("-")
distribution, version = self.short_chroot.split('-', 1)
chroot = self.short_chroot
while True:
repo_info, status_code = self._get(chroot)
if repo_info:
return repo_info
if distribution == "rhel":
chroot = "centos-stream"
chroot = "centos-stream-8"
distribution = "centos"
elif distribution == "centos":
if version == "stream":
if version == "stream-8":
version = "8"
elif version == "stream-9":
version = "9"
chroot = "epel-{0}".format(version)
distribution = "epel"
else: