Skip to content

Commit

Permalink
Add Debian 10
Browse files Browse the repository at this point in the history
  • Loading branch information
mmoll committed Dec 13, 2019
1 parent 2fb92c2 commit 9812f47
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 4 deletions.
1 change: 1 addition & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
beaker_sets:
- centos6-64
- debian9-64
- debian10-64
env:
global:
- PARALLEL_TEST_PROCESSORS=8
Expand Down
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,16 @@ matrix:
- echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
- sudo service docker restart

- rvm: 2.5.1
env:
- BEAKER_PUPPET_COLLECTION=puppet6
- BEAKER_setfile=debian10-64{hostname=debian10-64.example.com}
script: bundle exec rake beaker
services: docker
bundler_args: --without development
before_install:
- echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
- sudo service docker restart

bundler_args: --without system_tests development
dist: xenial
3 changes: 2 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"9"
"9",
"10"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
require 'spec_helper_acceptance'

describe 'Scenario: 5.3.6 to 5.3.7 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5' && fact('lsbdistcodename') != 'bionic' do
describe 'Scenario: 5.3.6 to 5.3.7 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet5' do
before(:context) do
if check_for_package(default, 'puppetserver')
on default, puppet('resource package puppetserver ensure=purged')
on default, 'rm -rf /etc/sysconfig/puppetserver /etc/puppetlabs/puppetserver'
on default, 'rm -rf /etc/puppetlabs/puppet/ssl'
end

# puppetserver won't start with lower than 2GB memory
# puppetserver won't start with low memory
memoryfree_mb = fact('memoryfree_mb').to_i
raise 'At least 2048MB free memory required' if memoryfree_mb < 256
raise 'At least 256MB free memory required' if memoryfree_mb < 256
end

case fact('osfamily')
Expand Down
90 changes: 90 additions & 0 deletions spec/acceptance/puppetserver_upgrade_6_7_0_to_6_7_2_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
require 'spec_helper_acceptance'

describe 'Scenario: 6.7.0 to 6.7.2 upgrade:', if: ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet6' do
before(:context) do
if check_for_package(default, 'puppetserver')
on default, puppet('resource package puppetserver ensure=purged')
on default, 'rm -rf /etc/sysconfig/puppetserver /etc/puppetlabs/puppetserver'
on default, 'rm -rf /etc/puppetlabs/puppet/ssl'
end

# puppetserver won't start with low memory
memoryfree_mb = fact('memoryfree_mb').to_i
raise 'At least 256MB free memory required' if memoryfree_mb < 256
end

case fact('osfamily')
when 'Debian'
from_version = "6.7.0-1#{fact('lsbdistcodename')}"
to_version = "6.7.2-1#{fact('lsbdistcodename')}"
else
from_version = '6.7.0'
to_version = '6.7.2'
end

context 'install 6.7.0' do
let(:pp) do
<<-EOS
class { '::puppet':
server => true,
server_foreman => false,
server_reports => 'store',
server_external_nodes => '',
server_version => '#{from_version}',
# only for install test - don't think to use this in production!
# https://docs.puppet.com/puppetserver/latest/tuning_guide.html
server_jvm_max_heap_size => '256m',
server_jvm_min_heap_size => '256m',
}
EOS
end

it_behaves_like 'a idempotent resource'

describe command('puppetserver --version') do
its(:stdout) { is_expected.to match("puppetserver version: 6.7.0\n") }
end

describe service('puppetserver') do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end

describe port('8140') do
it { is_expected.to be_listening }
end
end

context 'upgrade to 6.7.2' do
let(:pp) do
<<-EOS
class { '::puppet':
server => true,
server_foreman => false,
server_reports => 'store',
server_external_nodes => '',
server_version => '#{to_version}',
# only for install test - don't think to use this in production!
# https://docs.puppet.com/puppetserver/latest/tuning_guide.html
server_jvm_max_heap_size => '256m',
server_jvm_min_heap_size => '256m',
}
EOS
end

it_behaves_like 'a idempotent resource'

describe command('puppetserver --version') do
its(:stdout) { is_expected.to match("puppetserver version: 6.7.2\n") }
end

describe service('puppetserver') do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end

describe port('8140') do
it { is_expected.to be_listening }
end
end
end

0 comments on commit 9812f47

Please sign in to comment.