Skip to content
This repository was archived by the owner on Feb 21, 2020. It is now read-only.

Commit f8133d3

Browse files
committed
Merge pull request #37 from maestrodev/feature/Remove_support_of_old_SonarQube_versions
Remove support of old SonarQube versions (<4.0)
2 parents 2f33173 + d790105 commit f8133d3

File tree

3 files changed

+4
-24
lines changed

3 files changed

+4
-24
lines changed

manifests/init.pp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,7 @@
5252
# wget from https://github.com/maestrodev/puppet-wget
5353
include wget
5454

55-
if versioncmp($version, '4.0') < 0 {
56-
$package_name = 'sonar'
57-
}
58-
else {
59-
$package_name = 'sonarqube'
60-
}
55+
$package_name = 'sonarqube'
6156

6257
if $home != undef {
6358
$real_home = $home

spec/acceptance/sonarqube_system_spec.rb

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class { 'sonarqube':
3131
end
3232

3333
context 'when installing version 4' do
34-
let(:version) { '4.1.2' }
34+
let(:version) { '4.5.4' }
3535

3636
it_should_behave_like :sonar
3737

@@ -57,14 +57,4 @@ class { 'sonarqube' :
5757
end
5858
end
5959

60-
context 'when installing version 3' do
61-
let(:version) { '3.7.4' }
62-
63-
before(:all) do
64-
on(hosts, "service sonar stop && rm -rf /etc/init.d/sonar* #{installroot}* #{home}*")
65-
end
66-
67-
it_should_behave_like :sonar
68-
end
69-
7060
end

spec/classes/init_spec.rb

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@
44

55
let(:sonar_properties) { '/usr/local/sonar/conf/sonar.properties' }
66

7-
context "when installing version 3", :compile do
8-
let(:params) {{ :version => '3.7.4' }}
9-
it { should contain_wget__fetch('download-sonar').with_source('http://downloads.sonarsource.com/sonarqube/sonar-3.7.4.zip') }
10-
end
11-
127
context "when installing version 4", :compile do
13-
let(:params) {{ :version => '4.1.2' }}
14-
it { should contain_wget__fetch('download-sonar').with_source('http://downloads.sonarsource.com/sonarqube/sonarqube-4.1.2.zip') }
8+
let(:params) {{ :version => '4.5.4' }}
9+
it { should contain_wget__fetch('download-sonar').with_source('http://downloads.sonarsource.com/sonarqube/sonarqube-4.5.4.zip') }
1510
end
1611

1712
context "when crowd configuration is supplied", :compile do

0 commit comments

Comments
 (0)