Skip to content

Commit 0017586

Browse files
authored
ci(packit): fix extra parameters for TF (#75)
* ci(tmt): use tmt's feature/epel for enabling EPEL Signed-off-by: Matej Focko <mfocko@redhat.com> * ci(tmt): force EPEL before installing deps Essential dependencies are handled with `order = 30`, therefore it is needed to adjust the priority of enabling the EPEL, otherwise the deps (even from EPEL) are installed before the repo gets enabled. For more details see discussion here: https://redhat-internal.slack.com/archives/C04LRPNDZ4Y/p1752748187699709 Suggested-by: Petr Šplíchal <psplicha@redhat.com> Signed-off-by: Matej Focko <mfocko@redhat.com> * ci(packit): run only `packit-ci` plan via Packit The other plan is triggered externally and doesn't work correctly when triggered via Packit. Signed-off-by: Matej Focko <mfocko@redhat.com> --------- Signed-off-by: Matej Focko <mfocko@redhat.com>
1 parent 9627636 commit 0017586

3 files changed

Lines changed: 14 additions & 13 deletions

File tree

.packit.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ jobs:
66
- centos-stream-9-x86_64
77
- centos-stream-10-x86_64
88
skip_build: true
9+
tmt_plan: packit-ci
910
tf_extra_params:
1011
environments:
1112
- tmt:

packit-ci.fmf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ adjust:
3737
- when: distro != rhel-9 and distro == centos-stream-9 and distro != rhel-10 and distro == centos-stream-10
3838
enabled: false
3939
because: keylime_server role is RHEL-9 and RHEL-10 only
40-
- when: distro == rhel-9 or distro == centos-stream-9
40+
41+
- when: distro == rhel-9 or distro == centos-stream-9 or distro == rhel-10 or distro == centos-stream-10
4142
prepare+:
42-
- how: shell
43-
script:
44-
- rpm -Uv https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm || true
43+
- how: feature
44+
epel: enabled
45+
order: 10
4546

4647
execute:
4748
how: tmt

plans/test_playbooks_parallel.fmf

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ prepare:
2929
if grep -q 'CentOS Linux release 7.9' /etc/redhat-release; then
3030
sed -i '/^mirror/d;s/#\?\(baseurl=http:\/\/\)mirror/\1vault/' /etc/yum.repos.d/*.repo
3131
fi
32-
# Replace with feature: epel: enabled once https://github.com/teemtee/tmt/pull/3128 is merged
33-
- name: Enable epel to install beakerlib
34-
script: |
35-
# CS 10 and Fedora doesn't require epel
36-
if grep -q -e 'CentOS Stream release 10' -e 'Fedora release' /etc/redhat-release; then
37-
exit 0
38-
fi
39-
yum install epel-release yum-utils -y
40-
yum-config-manager --enable epel epel-debuginfo epel-source
4132
discover:
4233
- name: Prepare managed node
4334
how: fmf
@@ -60,5 +51,13 @@ discover:
6051
# filter: tag:reserve_system
6152
# url: https://github.com/linux-system-roles/tft-tests
6253
# ref: main
54+
55+
adjust:
56+
- when: distro == rhel-9 or distro == centos-stream-9 or distro == rhel-10 or distro == centos-stream-10
57+
prepare+:
58+
- how: feature
59+
epel: enabled
60+
order: 10
61+
6362
execute:
6463
how: tmt

0 commit comments

Comments
 (0)