Skip to content

Commit 65484cb

Browse files
committed
TMT: Replace adjust with prepare conditionals
Ensure all envs are setup correctly. Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent 283ffdf commit 65484cb

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

Diff for: .packit.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
trigger: pull_request
6666
packages: [crun-centos]
6767
notifications: *copr_build_failure_notification
68-
targets: &centos_targets
68+
targets: &centos_copr_targets
6969
# Need epel9 repos to fetch wasmedge build dependency
7070
centos-stream-9-x86_64:
7171
additional_repos:
@@ -107,7 +107,7 @@ jobs:
107107
trigger: pull_request
108108
packages: [crun-centos]
109109
notifications: *podman_system_test_fail_notification
110-
targets: *centos_targets
110+
targets: *centos_copr_targets
111111
tf_extra_params:
112112
environments:
113113
- artifacts:

Diff for: plans/main.fmf

+7-18
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,15 @@ discover:
22
how: fmf
33
execute:
44
how: tmt
5-
adjust:
5+
prepare:
6+
- how: feature
7+
epel: enabled
68
- when: initiator == packit
79
because: "We need to test with updated packages from rhcontainerbot/podman-next copr"
8-
prepare+:
9-
how: shell
10-
script: |
11-
sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo
12-
dnf -y upgrade --allowerasing
13-
# FIXME: Use epel10 once bats is available there
14-
- when: distro == centos-stream-10 or distro == rhel-10
15-
because: "bats isn't yet available on epel10"
16-
prepare+:
17-
how: install
18-
copr: rhcontainerbot/bats-el10
19-
package: bats
20-
- when: distro == centos-stream-9 or distro == rhel-9
21-
because: "bats is present on EPEL on rhel9 / c9s"
22-
prepare+:
23-
how: feature
24-
epel: enabled
10+
how: shell
11+
script: |
12+
sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo
13+
dnf -y upgrade --allowerasing
2514

2615
/upstream:
2716
summary: Run crun specific Podman system tests on upstream PRs

0 commit comments

Comments
 (0)