Packit+TMT: Fix copr repo enablement on upstream CentOS Stream tests

The previous `adjust` conditionals ended up skipping copr repo and package upgrade steps for CentOS Stream environments. This should be resolved by directly using `prepare` and `when` keywords for setting conditions. Signed-off-by: Lokesh Mandvekar <[email protected]>
containers · Dec 31, 2024 · 5367cf6 · 5367cf6
1 parent bd4f773
commit 5367cf6
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/plans/main.fmf b/plans/main.fmf
@@ -2,26 +2,23 @@ discover:
     how: fmf
 execute:
     how: tmt
-adjust:
+prepare:
     - when: initiator == packit
       because: "We need to test with updated packages from rhcontainerbot/podman-next copr"
-      prepare+:
-        how: shell
-        script: |
-            sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo
-            dnf -y upgrade --allowerasing
+      how: shell
+      script: |
+        sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo
+        dnf -y upgrade --allowerasing
     # FIXME: Use epel10 once bats is available there
     - when: distro == centos-stream-10 or distro == rhel-10
       because: "bats isn't yet available on epel10"
-      prepare+:
-        how: install
-        copr: rhcontainerbot/bats-el10
-        package: bats
+      how: install
+      copr: rhcontainerbot/bats-el10
+      package: bats
     - when: distro == centos-stream-9 or distro == rhel-9
       because: "bats is present on EPEL on rhel9 / c9s"
-      prepare+:
-        how: feature
-        epel: enabled
+      how: feature
+      epel: enabled
 
 /upstream:
     summary: Run crun specific Podman system tests on upstream PRs