-
Notifications
You must be signed in to change notification settings - Fork 328
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add SLES12 support as it has changed to Systemd #217
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- | ||
HOSTS: | ||
czriitzephrrlzw: | ||
roles: | ||
- master | ||
- database | ||
- dashboard | ||
- agent | ||
- default | ||
platform: sles-12-x86_64 | ||
template: sles-12-x86_64 | ||
hypervisor: vcloud | ||
CONFIG: | ||
nfs_server: none | ||
consoleport: 443 | ||
datastore: instance0 | ||
folder: Delivery/Quality Assurance/Enterprise/Dynamic | ||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic | ||
pooling_api: http://vcloud.delivery.puppetlabs.net/ | ||
pe_dir: http://enterprise.delivery.puppetlabs.net/3.4/preview |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,25 @@ | ||
require 'beaker-rspec' | ||
|
||
UNSUPPORTED_PLATFORMS = [ 'windows', 'Darwin' ] | ||
UNSUPPORTED_PLATFORMS = ['windows', 'Darwin'] | ||
|
||
unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no' | ||
# This will install the latest available package on el and deb based | ||
# systems fail on windows and osx, and install via gem on other *nixes | ||
foss_opts = { :default_action => 'gem_install' } | ||
foss_opts = {:default_action => 'gem_install'} | ||
|
||
if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end | ||
if default.is_pe?; then | ||
install_pe; | ||
else | ||
install_puppet(foss_opts); | ||
end | ||
|
||
hosts.each do |host| | ||
unless host.is_pe? | ||
on host, "/bin/echo '' > #{host['hieraconf']}" | ||
end | ||
on host, "mkdir -p #{host['distmoduledir']}" | ||
on host, puppet('module install puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] } | ||
on host, apply_manifest('package{"git":ensure => present}') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is going to fail on at least EL5 if you don't include EPEL. Why do we need to get stdlib from git? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because of blasted Cert issues 👎 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we can add logic to do os specific if we really want to differentiate There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I ran the acceptance against Centos 5 and Puppet 3.7.2 and it ran beautifully, is it an older version that you are thinking might have issues with not having EPEL? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ergh, guess I forgot the images on vcloud were updated to include git :( |
||
on host, 'git clone -b 3.2.x https://github.com/puppetlabs/puppetlabs-stdlib /etc/puppetlabs/puppet/modules/stdlib' | ||
end | ||
end | ||
|
||
|
@@ -29,6 +34,7 @@ | |
c.before :suite do | ||
hosts.each do |host| | ||
on host, "mkdir -p #{host['distmoduledir']}/ntp" | ||
on host, puppet('module install puppetlabs-stdlib') | ||
%w(lib manifests templates metadata.json).each do |file| | ||
scp_to host, "#{proj_root}/#{file}", "#{host['distmoduledir']}/ntp" | ||
end | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line is causing the unit tests to fail. https://travis-ci.org/puppetlabs/puppetlabs-ntp/jobs/38836872
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in test cases