Skip to content

Commit

Permalink
(maint) acceptance test: use https for package repos
Browse files Browse the repository at this point in the history
  • Loading branch information
austb committed Mar 14, 2022
1 parent 36155ff commit 9842144
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions acceptance/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -865,19 +865,19 @@ def initialize_repo_on_host(host, os, nightly, puppet_platform = :puppet6)
if options[:type] == 'aio' then
if nightly && puppet_platform == :puppet6
## puppet6 repos
on host, "curl -O http://nightlies.puppet.com/apt/puppet6-nightly-release-$(lsb_release -sc).deb"
on host, "curl -O https://nightlies.puppet.com/apt/puppet6-nightly-release-$(lsb_release -sc).deb"
on host, "dpkg -i puppet6-nightly-release-$(lsb_release -sc).deb"

elsif nightly && puppet_platform == :puppet5
on host, "curl -O http://nightlies.puppet.com/apt/puppet5-nightly-release-$(lsb_release -sc).deb"
on host, "curl -O https://nightlies.puppet.com/apt/puppet5-nightly-release-$(lsb_release -sc).deb"
on host, "dpkg -i puppet5-nightly-release-$(lsb_release -sc).deb"

else
on host, "curl -O http://apt.puppet.com/puppet6-release-$(lsb_release -sc).deb"
on host, "curl -O https://apt.puppet.com/puppet6-release-$(lsb_release -sc).deb"
on host, "dpkg -i puppet6-release-$(lsb_release -sc).deb"
end
else
on host, "curl -O http://apt.puppet.com/puppet6-release-$(lsb_release -sc).deb"
on host, "curl -O https://apt.puppet.com/puppet6-release-$(lsb_release -sc).deb"
on host, "dpkg -i puppet6-release-$(lsb_release -sc).deb"
end
on host, "apt-get update"
Expand All @@ -891,16 +891,16 @@ def initialize_repo_on_host(host, os, nightly, puppet_platform = :puppet6)

if nightly && puppet_platform == :puppet6
## puppet6 repos
on host, "curl -O http://nightlies.puppet.com/yum/puppet6-nightly-release-#{variant}-#{version}.noarch.rpm"
on host, "curl -O https://nightlies.puppet.com/yum/puppet6-nightly-release-#{variant}-#{version}.noarch.rpm"
on host, "rpm -i puppet6-nightly-release-#{variant}-#{version}.noarch.rpm"

elsif nightly && puppet_platform == :puppet5
## puppet6 repos
on host, "curl -O http://nightlies.puppet.com/yum/puppet5-nightly-release-#{variant}-#{version}.noarch.rpm"
on host, "curl -O https://nightlies.puppet.com/yum/puppet5-nightly-release-#{variant}-#{version}.noarch.rpm"
on host, "rpm -i puppet5-nightly-release-#{variant}-#{version}.noarch.rpm"

else
on host, "curl -O http://yum.puppet.com/puppet6-release-#{variant}-#{version}.noarch.rpm"
on host, "curl -O https://yum.puppet.com/puppet6-release-#{variant}-#{version}.noarch.rpm"
on host, "rpm -i puppet6-release-#{variant}-#{version}.noarch.rpm"
end
else
Expand All @@ -909,25 +909,25 @@ def initialize_repo_on_host(host, os, nightly, puppet_platform = :puppet6)
create_remote_file host, '/etc/yum.repos.d/puppetlabs-dependencies.repo', <<-REPO.gsub(' '*8, '')
[puppetlabs-dependencies]
name=Puppet Labs Dependencies - $basearch
baseurl=http://yum.puppetlabs.com/el/$releasever/dependencies/$basearch
gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
baseurl=https://yum.puppetlabs.com/el/$releasever/dependencies/$basearch
gpgkey=https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
enabled=1
gpgcheck=1
REPO

create_remote_file host, '/etc/yum.repos.d/puppetlabs-products.repo', <<-REPO.gsub(' '*8, '')
[puppetlabs-products]
name=Puppet Labs Products - $basearch
baseurl=http://yum.puppetlabs.com/el/$releasever/products/$basearch
gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
baseurl=https://yum.puppetlabs.com/el/$releasever/products/$basearch
gpgkey=https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
enabled=1
gpgcheck=1
REPO

create_remote_file host, '/etc/yum.repos.d/epel.repo', <<-REPO
[epel]
name=Extra Packages for Enterprise Linux $releasever - $basearch
baseurl=http://download.fedoraproject.org/pub/epel/$releasever/$basearch
baseurl=https://download.fedoraproject.org/pub/epel/$releasever/$basearch
mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
failovermethod=priority
enabled=1
Expand All @@ -938,17 +938,17 @@ def initialize_repo_on_host(host, os, nightly, puppet_platform = :puppet6)
create_remote_file host, '/etc/yum.repos.d/puppetlabs-dependencies.repo', <<-REPO.gsub(' '*8, '')
[puppetlabs-dependencies]
name=Puppet Labs Dependencies - $basearch
baseurl=http://yum.puppetlabs.com/fedora/f$releasever/dependencies/$basearch
gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
baseurl=https://yum.puppetlabs.com/fedora/f$releasever/dependencies/$basearch
gpgkey=https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
enabled=1
gpgcheck=1
REPO

create_remote_file host, '/etc/yum.repos.d/puppetlabs-products.repo', <<-REPO.gsub(' '*8, '')
[puppetlabs-products]
name=Puppet Labs Products - $basearch
baseurl=http://yum.puppetlabs.com/fedora/f$releasever/products/$basearch
gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
baseurl=https://yum.puppetlabs.com/fedora/f$releasever/products/$basearch
gpgkey=https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
enabled=1
gpgcheck=1
REPO
Expand Down

0 comments on commit 9842144

Please sign in to comment.