Fix recommended packages handling for rpm-ostree

Bugfix for missing packages install failure on recommends fmf request, missing should retrieve parent.missing attribute not packages. Extend the test coverage for fedora-coreos as well. Co-authored-by: Petr Šplíchal <[email protected]>
teemtee · Oct 10, 2022 · b04414f · b04414f
1 parent 2d11678
commit b04414f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/tests/prepare/recommend/main.fmf b/tests/prepare/recommend/main.fmf
@@ -3,3 +3,14 @@ description:
     Run a simple test which recommends two packages. Check that
     the existing one is installed and the other one is ignored. No
     error should be reported.
+environment:
+    METHODS: container
+adjust:
+  - when: trigger == commit
+    environment:
+        METHODS: container local
+    because: the pipeline does not support nested virtualization
+  - when: how == full
+    environment:
+        METHODS: container virtual local
+    because: local/virtual provision needs root/full virtualization
diff --git a/tests/prepare/recommend/test.sh b/tests/prepare/recommend/test.sh
@@ -6,10 +6,29 @@ rlJournalStart
         rlRun "pushd data"
     rlPhaseEnd
 
-    for image in centos:7 centos:stream8 fedora; do
-        rlPhaseStartTest "Test $image"
-            rlRun "tmt run -ar provision -h container -i $image"
+    for method in ${METHODS:-container}; do
+        tmt="tmt run --all --remove provision --how $method"
+
+        # Verify against the default provision image
+        rlPhaseStartTest "Test the default image ($method)"
+            rlRun "$tmt"
         rlPhaseEnd
+
+        # Check CentOS images for container provision
+        if [[ "$method" == "container" ]]; then
+            for image in centos:7 centos:stream8; do
+                rlPhaseStartTest "Test $image ($method)"
+                    rlRun "$tmt --image $image"
+                rlPhaseEnd
+            done
+        fi
+
+        # Add one extra CoreOS run for virtual provision
+        if [[ "$method" == "virtual" ]]; then
+            rlPhaseStartTest "Test fedora-coreos ($method)"
+                rlRun "$tmt --image fedora-coreos"
+            rlPhaseEnd
+        fi
     done
 
     rlPhaseStartCleanup

diff --git a/tmt/steps/prepare/install.py b/tmt/steps/prepare/install.py
@@ -292,7 +292,7 @@ def sort_packages(self) -> None:
 
     def prepare_command(self) -> None:
         """ Prepare installation command for rpm-ostree"""
-        missing = cast(tmt.steps.prepare.PreparePlugin, self.parent).get("package")
+        missing = cast(tmt.steps.prepare.PreparePlugin, self.parent).get("missing")
         self.skip = True if missing == 'skip' else False
         self.command = f"{self.sudo}rpm-ostree"
         self.options = '--apply-live --idempotent --allow-inactive'