Skip to content

Commit

Permalink
(SIMP-10204) Ensure testing with CentOS 8.4 (#28)
Browse files Browse the repository at this point in the history
- update the EL8 nodes in the acceptance tests
  to run with generic/centos8 to make sure they using
  CentOS 8.4
- remove epel repo from nodeset. Epel repo is installed by
  simp beaker helpers.

SIMP-10204 #comment update rkhunter
SIMP-10238 #close
  • Loading branch information
jeannegreulich authored Jul 7, 2021
1 parent e0ff293 commit 420ccd0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 21 deletions.
14 changes: 3 additions & 11 deletions spec/acceptance/nodesets/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,9 @@ HOSTS:
roles:
- client
platform: el-8-x86_64
box: centos/8
box: generic/centos8
hypervisor: <%= hypervisor %>
yum_repos:
epel:
mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch'
gpgkeys:
- https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever

el7:
roles:
- default
Expand All @@ -25,11 +21,7 @@ HOSTS:
platform: el-7-x86_64
box: centos/7
hypervisor: <%= hypervisor %>
yum_repos:
epel:
mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch'
gpgkeys:
- https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever

CONFIG:
log_level: verbose
type: aio
Expand Down
12 changes: 2 additions & 10 deletions spec/acceptance/nodesets/oel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@ HOSTS:
platform: el-8-x86_64
box: generic/oracle8
hypervisor: <%= hypervisor %>
yum_repos:
epel:
mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch'
gpgkeys:
- https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever

oel7:
roles:
- default
Expand All @@ -25,11 +21,7 @@ HOSTS:
platform: el-7-x86_64
box: generic/oracle7
hypervisor: <%= hypervisor %>
yum_repos:
epel:
mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch'
gpgkeys:
- https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever

CONFIG:
log_level: verbose
type: aio
Expand Down

0 comments on commit 420ccd0

Please sign in to comment.