Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 13.0', :require => false
gem 'voxpupuli-test', '~> 14.0', :require => false
gem 'puppet_metadata', '~> 5.0', :require => false
gem 'puppet-lint-package_ensure-check', :require => false
gem 'puppet-lint-resource_reference_syntax', :require => false
Expand Down
16 changes: 8 additions & 8 deletions spec/classes/daqsdk_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
mode: '0755',
force: false,
purge: false,
recurse: false
recurse: false,
)
end

Expand All @@ -29,13 +29,13 @@
ensure: 'directory',
mode: '0755',
owner: 'root',
group: 'root'
group: 'root',
)
end

it do
is_expected.to contain_archive('/opt/lsst/daq-sdk/dl/R5-V10.3.tgz').with(
source: 'https://repo-nexus.lsst.org/nexus/repository/daq/daq-sdk/R5-V10.3.tgz'
source: 'https://repo-nexus.lsst.org/nexus/repository/daq/daq-sdk/R5-V10.3.tgz',
)
end

Expand All @@ -44,15 +44,15 @@
ensure: 'file',
mode: '0644',
owner: 'root',
group: 'root'
group: 'root',
)
end

it do
is_expected.to contain_file('/opt/lsst/daq-sdk/R5-V10.3').with(
owner: 'root',
group: 'root',
recurse: true
recurse: true,
)
end

Expand All @@ -61,7 +61,7 @@
ensure: 'link',
owner: 'root',
group: 'root',
target: 'R5-V10.3'
target: 'R5-V10.3',
)
end
end
Expand All @@ -74,7 +74,7 @@
is_expected.to contain_file('/opt/lsst/daq-sdk').with(
force: true,
purge: true,
recurse: true
recurse: true,
)
end
end
Expand All @@ -86,7 +86,7 @@
is_expected.to contain_file('/opt/lsst/daq-sdk').with(
force: false,
purge: false,
recurse: false
recurse: false,
)
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
ensure: 'directory',
mode: '0755',
owner: 'root',
group: 'root'
group: 'root',
)
end
end
Expand Down
16 changes: 8 additions & 8 deletions spec/classes/rptsdk_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
mode: '0755',
force: false,
purge: false,
recurse: false
recurse: false,
)
end

Expand All @@ -29,13 +29,13 @@
ensure: 'directory',
mode: '0755',
owner: 'root',
group: 'root'
group: 'root',
)
end

it do
is_expected.to contain_archive('/opt/lsst/rpt-sdk/dl/rce-sdk-V3.5.3.tar.gz').with(
source: 'https://repo-nexus.lsst.org/nexus/repository/daq/rpt-sdk/rce-sdk-V3.5.3.tar.gz'
source: 'https://repo-nexus.lsst.org/nexus/repository/daq/rpt-sdk/rce-sdk-V3.5.3.tar.gz',
)
end

Expand All @@ -44,15 +44,15 @@
ensure: 'file',
mode: '0644',
owner: 'root',
group: 'root'
group: 'root',
)
end

it do
is_expected.to contain_file('/opt/lsst/rpt-sdk/V3.5.3').with(
owner: 'root',
group: 'root',
recurse: true
recurse: true,
)
end

Expand All @@ -61,7 +61,7 @@
ensure: 'link',
owner: 'root',
group: 'root',
target: 'V3.5.3'
target: 'V3.5.3',
)
end
end
Expand All @@ -74,7 +74,7 @@
is_expected.to contain_file('/opt/lsst/rpt-sdk').with(
force: true,
purge: true,
recurse: true
recurse: true,
)
end
end
Expand All @@ -86,7 +86,7 @@
is_expected.to contain_file('/opt/lsst/rpt-sdk').with(
force: false,
purge: false,
recurse: false
recurse: false,
)
end
end
Expand Down
22 changes: 11 additions & 11 deletions spec/classes/service/dsid_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
mode: '0644',
owner: 'root',
group: 'root',
content: %r{interface=lsst-daq}
content: %r{interface=lsst-daq},
)
end

Expand All @@ -27,24 +27,24 @@
ensure: 'directory',
owner: 'root',
group: 'daq',
mode: '0775'
mode: '0775',
)
end

it do
is_expected.to contain_systemd__unit_file('dsid.service').
with_content(%r{EnvironmentFile=/etc/sysconfig/daq}).
with_content(%r{ExecStart=/opt/lsst/daq-sdk/current/x86/bin/dsid_startup})
is_expected.to contain_systemd__unit_file('dsid.service')
.with_content(%r{EnvironmentFile=/etc/sysconfig/daq})
.with_content(%r{ExecStart=/opt/lsst/daq-sdk/current/x86/bin/dsid_startup})
end

it do
is_expected.to contain_service('dsid').
with(
is_expected.to contain_service('dsid')
.with(
ensure: 'running',
enable: true
).
that_subscribes_to('File[/etc/sysconfig/daq]').
that_subscribes_to('Systemd::Unit_file[dsid.service]')
enable: true,
)
.that_subscribes_to('File[/etc/sysconfig/daq]')
.that_subscribes_to('Systemd::Unit_file[dsid.service]')
end
end
end
Expand Down
22 changes: 11 additions & 11 deletions spec/classes/service/rce_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
mode: '0644',
owner: 'root',
group: 'root',
content: %r{interface=lsst-daq}
content: %r{interface=lsst-daq},
)
end

Expand All @@ -27,24 +27,24 @@
ensure: 'directory',
owner: 'root',
group: 'daq',
mode: '0775'
mode: '0775',
)
end

it do
is_expected.to contain_systemd__unit_file('rce.service').
with_content(%r{EnvironmentFile=/etc/sysconfig/daq}).
with_content(%r{ExecStart=/opt/lsst/daq-sdk/current/x86/bin/dsm_startup})
is_expected.to contain_systemd__unit_file('rce.service')
.with_content(%r{EnvironmentFile=/etc/sysconfig/daq})
.with_content(%r{ExecStart=/opt/lsst/daq-sdk/current/x86/bin/dsm_startup})
end

it do
is_expected.to contain_service('rce').
with(
is_expected.to contain_service('rce')
.with(
ensure: 'running',
enable: true
).
that_subscribes_to('File[/etc/sysconfig/daq]').
that_subscribes_to('Systemd::Unit_file[rce.service]')
enable: true,
)
.that_subscribes_to('File[/etc/sysconfig/daq]')
.that_subscribes_to('Systemd::Unit_file[rce.service]')
end
end
end
Expand Down
Loading