Skip to content

Commit db6de04

Browse files
committed
ci: use the new epel feature to enable EPEL for testing farm
Now that teemtee/tmt#3128 has merged we can use the new epel feature to enable EPEL for testing farm Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent 0d49f81 commit db6de04

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

contributing.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ often useful to redirect/duplicate to a log by setting `ANSIBLE_LOG_PATH`.
129129

130130
There is also `/tmp/blivet.log` in case there are problems doing the actual
131131
storage management.
132+
132133
## Running CI Tests Locally
133134

134135
### Use tox-lsr with qemu

plans/test_playbooks_parallel.fmf

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,6 @@ prepare:
5959
if grep -q 'CentOS Linux release 7.9' /etc/redhat-release; then
6060
sed -i '/^mirror/d;s/#\?\(baseurl=http:\/\/\)mirror/\1vault/' /etc/yum.repos.d/*.repo
6161
fi
62-
# Replace with feature: epel: enabled once https://github.com/teemtee/tmt/pull/3128 is merged
63-
- name: Enable epel to install beakerlib
64-
script: |
65-
# CS 10 and Fedora doesn't require epel
66-
if grep -q -e 'CentOS Stream release 10' -e 'Fedora release' /etc/redhat-release; then
67-
exit 0
68-
fi
69-
yum install epel-release yum-utils -y
70-
yum-config-manager --enable epel epel-debuginfo epel-source
7162
discover:
7263
- name: Prepare managed node
7364
how: fmf
@@ -90,5 +81,11 @@ discover:
9081
# filter: tag:reserve_system
9182
# url: https://github.com/linux-system-roles/tft-tests
9283
# ref: main
84+
adjust:
85+
- when: distro == rhel-9 or distro == centos-stream-9 or distro == rhel-10 or distro == centos-stream-10
86+
prepare+:
87+
- how: feature
88+
epel: enabled
89+
order: 10
9390
execute:
94-
how: tmt
91+
how: tmt

0 commit comments

Comments
 (0)