Acceptance tests: Stop using EPEL 7 on EL8

ekohl · ekohl · commit f8c944904710 · 2022-06-09T13:18:20.000+02:00
Fixes: cd81ee3
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
@@ -63,12 +63,6 @@ class { 'epel':
           epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
           epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
         }
-      } elsif $::operatingsystemmajrelease == '8' {
-          class { 'epel':
-                os_maj_release => "7",
-                epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",
-                epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",
-          }
       } else {
         class { 'epel': }
       }

Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,6 @@ class { 'epel':`
`63`	`63`	`epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",`
`64`	`64`	`epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",`
`65`	`65`	`}`
`66`		`- } elsif $::operatingsystemmajrelease == '8' {`
`67`		`- class { 'epel':`
`68`		`- os_maj_release => "7",`
`69`		`- epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",`
`70`		`- epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",`
`71`		`- }`
`72`	`66`	`} else {`
`73`	`67`	`class { 'epel': }`
`74`	`68`	`}`