Address review comments

* remove resolve dependency test in the stream plan * the package we tried to install as a dependency issue causing pkg is breaking CentOS Stream altogether Signed-off-by: Daniel Diblik <[email protected]>
oamg · May 31, 2024 · dac7790 · dac7790
1 parent 651ef00
commit dac7790
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/plans/stream.fmf b/plans/stream.fmf
@@ -1,8 +1,8 @@
 summary+: |
     CentOS Stream plans
 description+: |
-    This needs to be changed.
-    Pls anyone remind me, if I forgot.
+    Separate plan for CentOS Stream.
+    The plan is separated, so we can keep better control of when it will be run.
 
 enabled: false
 

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -577,7 +577,7 @@ def hybrid_rocky_image(shell):
     """
     grubenv_file = "/boot/grub2/grubenv"
     is_efi = shell("efibootmgr", silent=True).returncode
-    if "rocky" in SystemInformationRelease.distribution and is_efi != 0:
+    if "rocky" in SystemInformationRelease.distribution and is_efi not in (None, 0):
         if os.path.islink(grubenv_file):
             target_grubenv_file = os.path.realpath(grubenv_file)
 

diff --git a/tests/integration/tier0/destructive/single-yum-transaction/install_dependency_packages.py b/tests/integration/tier0/destructive/single-yum-transaction/install_dependency_packages.py
@@ -20,7 +20,7 @@ def test_install_dependency_packages(shell):
         "python-requests",  # OAMG-4936
     ]
     if SystemInformationRelease.version.major == 8:
-        if "oracle-8" in SYSTEM_RELEASE_ENV:
+        if SystemInformationRelease.distribution == "oracle":
             dependency_pkgs = [
                 "iwl7260-firmware",  # RHELC-567
                 "iwlax2xx-firmware",  # RHELC-567 - causing problems during the conversion on OL8