Skip to content

Commit a162ba6

Browse files
committed
(maint) Update puppet repo urls
1 parent 728ade1 commit a162ba6

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

spec/spec_helper_acceptance.rb

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,27 @@
99
# install_puppet
1010
if host['platform'] =~ %r{el-(5|6|7)}
1111
relver = Regexp.last_match(1)
12-
on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-pc1-el-#{relver}.noarch.rpm"
12+
on host, "rpm -ivh http://yum.puppetlabs.com/puppet5/puppet5-release-el-#{relver}.noarch.rpm"
1313
on host, 'yum install -y puppetserver'
1414
elsif host['platform'] =~ %r{fedora-(\d+)}
1515
relver = Regexp.last_match(1)
16-
on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-pc1-fedora-#{relver}.noarch.rpm"
16+
on host, "rpm -ivh http://yum.puppetlabs.com/puppet5/puppet5-release-fedora-#{relver}.noarch.rpm"
1717
on host, 'yum install -y puppetserver'
1818
elsif host['platform'] =~ %r{(ubuntu|debian)}
1919
unless host.check_for_package 'curl'
2020
on host, 'apt-get install -y curl'
2121
end
22+
# For openjdk8
23+
if host['platform'].version == '8'
24+
create_remote_file(host,
25+
"/etc/apt/sources.list.d/jessie-backports.list",
26+
"deb http://httpredir.debian.org/debian jessie-backports main")
27+
on host, 'apt-get -y -m update'
28+
on host, 'apt-get install -y -t jessie-backports openjdk-8-jre-headless'
29+
end
2230
on host, 'apt-get install apt-transport-https --assume-yes'
23-
on host, 'curl -O http://apt.puppetlabs.com/puppetlabs-release-pc1-$(lsb_release -c -s).deb'
24-
on host, 'dpkg -i puppetlabs-release-pc1-$(lsb_release -c -s).deb'
31+
on host, 'curl -O http://apt.puppetlabs.com/puppet5-release-$(lsb_release -c -s).deb'
32+
on host, 'dpkg -i puppet5-release-$(lsb_release -c -s).deb'
2533
on host, 'apt-get -y -m update'
2634
on host, 'apt-get install -y puppetserver'
2735
else

0 commit comments

Comments
 (0)