From d6bd64538a5fd9a3f4867d409d9ce61773057027 Mon Sep 17 00:00:00 2001 From: jeannegreulich Date: Tue, 6 Jul 2021 08:30:38 -0400 Subject: [PATCH] (SIMP-10204) Ensure testing with CentOS 8.4 (#67) - update the EL8 nodes in the acceptance tests to run with generic/centos8 to make sure they using CentOS 8.4 - remove epel from repo list. It is automatically added by linux-errata in beaker helpers SIMP-10204 #comment clamav updated SIMP-10211 #close --- spec/acceptance/nodesets/default.yml | 3 +-- spec/acceptance/nodesets/oel.yml | 15 ++------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index 5fa4d8c..12918ce 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -9,7 +9,6 @@ HOSTS: el7: roles: - client - # roles migrated from now-removed el6 node(s): - default - master platform: el-7-x86_64 @@ -25,7 +24,7 @@ HOSTS: roles: - client platform: el-8-x86_64 - box: centos/8 + box: generic/centos8 hypervisor: <%= hypervisor %> yum_repos: epel: diff --git a/spec/acceptance/nodesets/oel.yml b/spec/acceptance/nodesets/oel.yml index b5f7f76..4e17e99 100644 --- a/spec/acceptance/nodesets/oel.yml +++ b/spec/acceptance/nodesets/oel.yml @@ -9,17 +9,11 @@ HOSTS: oel7: roles: - client - # roles migrated from now-removed el6 node(s): - default - master platform: el-7-x86_64 - box: onyxpoint/oel-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 oel8: roles: @@ -27,12 +21,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 -CONFIG: + CONFIG: log_level: verbose type: aio