diff --git a/acceptance/lib/helper.rb b/acceptance/lib/helper.rb index d4e5428ecf..6c9e35405d 100644 --- a/acceptance/lib/helper.rb +++ b/acceptance/lib/helper.rb @@ -64,6 +64,7 @@ def puppetdb_supported_platforms() [ /debian-8/, /debian-9/, + /el-6/, /el-7/, /ubuntu-16.04/, /ubuntu-18.04/ diff --git a/acceptance/suites/pre_suite/foss/10_update_ca_certs.rb b/acceptance/suites/pre_suite/foss/10_update_ca_certs.rb index a4f2e82b31..ae56517b47 100644 --- a/acceptance/suites/pre_suite/foss/10_update_ca_certs.rb +++ b/acceptance/suites/pre_suite/foss/10_update_ca_certs.rb @@ -1,6 +1,12 @@ step 'Update CA certs on Centos' do hosts.each do |host| - if host.platform =~ /el-7/ + if host.platform =~ /el-6/ + # Our EL6 images do not have recent enough repos to pull down the updated ca-certificates package, + # so we need to edit their configs before attempting to upgrade it + on(host, 'rm -f /etc/yum.repos.d/localmirror-extras.repo /etc/yum.repos.d/localmirror-optional.repo') + on(host, "sed -i 's/68/610/' /etc/yum.repos.d/localmirror-os.repo") + on(host, 'yum update -y ca-certificates') + elsif host.platform =~ /el-7/ on(host, 'yum update -y ca-certificates') elsif host.platform =~ /debian|ubuntu/ on(host, 'apt-get update')