diff options
author | Daniel P. Berrangé <berrange@redhat.com> | 2024-04-29 18:31:12 +0100 |
---|---|---|
committer | Daniel P. Berrangé <berrange@redhat.com> | 2024-04-29 18:37:31 +0100 |
commit | 46fd6f3a8bce74dfd2b0b1a546fdace6711818e7 (patch) | |
tree | b0391fbf30e4b307cf9c9eb3004fd39c489af3a1 | |
parent | c95552b83aa214fe322a425d97dd31af395aded6 (diff) | |
download | libvirt-ci-46fd6f3a8bce74dfd2b0b1a546fdace6711818e7.zip libvirt-ci-46fd6f3a8bce74dfd2b0b1a546fdace6711818e7.tar.gz libvirt-ci-46fd6f3a8bce74dfd2b0b1a546fdace6711818e7.tar.bz2 |
formatters: drop logic for CentOS Stream8
Now that the target is removed, logic for CentOS Stream8 is no longer
required.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r-- | lcitool/formatters.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lcitool/formatters.py b/lcitool/formatters.py index 8b953e3..8f35d5a 100644 --- a/lcitool/formatters.py +++ b/lcitool/formatters.py @@ -277,8 +277,7 @@ class BuildEnvFormatter(Formatter): # For rolling distros, it's preferable to do a distro syncing type # of update rather than a regular package update if (osname == "Fedora" and osversion == "Rawhide" or - osname == "CentOS" and (osversion == "Stream8" or - osversion == "Stream9")): + osname == "CentOS"): commands.extend(["{nosync}{packaging_command} distro-sync -y"]) elif osname == "OpenSUSE" and osversion == "Tumbleweed": commands.extend(["{nosync}{packaging_command} dist-upgrade -y"]) @@ -300,7 +299,7 @@ class BuildEnvFormatter(Formatter): commands.extend([ "{nosync}{packaging_command} config-manager --set-enabled -y crb", ]) - if osversion in ["8", "Stream8"]: + if osversion in ["8"]: commands.extend([ "{nosync}{packaging_command} config-manager --set-enabled -y powertools", ]) @@ -308,7 +307,7 @@ class BuildEnvFormatter(Formatter): # Not all of the virt related -devel packages are provided by # virt:rhel module so we have to enable AV repository as well. # CentOS Stream 9 no longer uses modules for virt - if osversion in ["8", "Stream8"]: + if osversion in ["8"]: commands.extend([ "{nosync}{packaging_command} install -y centos-release-advanced-virtualization", ]) @@ -320,7 +319,7 @@ class BuildEnvFormatter(Formatter): ]) # For CentOS Stream, we want EPEL Next as well - if osversion in ["Stream8", "Stream9"]: + if osversion in ["Stream9"]: commands.extend([ "{nosync}{packaging_command} install -y epel-next-release", ]) |