Skip to content

Commit 8c6d776

Browse files
Merge pull request #2589 from Magisus/el6-ca-certs
(maint) Fix ca-certificates update for el6; re-enable PDB
2 parents 3d57c61 + ef3c118 commit 8c6d776

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

acceptance/lib/helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ def puppetdb_supported_platforms()
6464
[
6565
/debian-8/,
6666
/debian-9/,
67+
/el-6/,
6768
/el-7/,
6869
/ubuntu-16.04/,
6970
/ubuntu-18.04/

acceptance/suites/pre_suite/foss/10_update_ca_certs.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
step 'Update CA certs on Centos' do
22
hosts.each do |host|
3-
if host.platform =~ /el-7/
3+
if host.platform =~ /el-6/
4+
# Our EL6 images do not have recent enough repos to pull down the updated ca-certificates package,
5+
# so we need to edit their configs before attempting to upgrade it
6+
on(host, 'rm -f /etc/yum.repos.d/localmirror-extras.repo /etc/yum.repos.d/localmirror-optional.repo')
7+
on(host, "sed -i 's/68/610/' /etc/yum.repos.d/localmirror-os.repo")
8+
on(host, 'yum update -y ca-certificates')
9+
elsif host.platform =~ /el-7/
410
on(host, 'yum update -y ca-certificates')
511
elsif host.platform =~ /debian|ubuntu/
612
on(host, 'apt-get update')

0 commit comments

Comments
 (0)