Skip to content
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.

Sign up for GitHub

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

Jump to bottom

drop el7 support #32

Closed
wants to merge 2 commits into from
Closed

drop el7 support #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccab47f
drop el7 support
jhoblitt Jul 31, 2024
d2cd81e
bump default daqsdk version to R5-V10.3
jhoblitt Jul 31, 2024
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 REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Data type: `String`

DAQ SDK relase version string

Default value: `'R5-V3.2'`
Default value: `'R5-V10.3'`

##### <a name="-daq--daqsdk--purge"></a>`purge`

Expand Down
2 changes: 1 addition & 1 deletion manifests/daqsdk.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
class daq::daqsdk (
Stdlib::HTTPUrl $repo_url = 'https://repo-nexus.lsst.org/nexus/repository/daq/daq-sdk',
String $version = 'R5-V3.2',
String $version = 'R5-V10.3',
Boolean $purge = false,
) {
require daq
Expand Down
9 changes: 3 additions & 6 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,14 @@
})

# XXX The current dsid/rce service binaries are linked against
# libreadline.so.6, which does not exist in EL8+. error while loading shared
# libraries: libreadline.so.6: cannot open shared object file: No such file or
# directory
if fact('os.family') == 'RedHat' and versioncmp(fact('os.release.major'), '8') >= 0 {
# libreadline.so.7, which does not exist in EL9+.
if fact('os.family') == 'RedHat' and versioncmp(fact('os.release.major'), '9') >= 0 {
$readline = fact('os.release.major') ? {
'8' => 'libreadline.so.7.0',
'9' => 'libreadline.so.8.1',
default => 'libreadline.so.8.1',
}

file { '/usr/lib64/libreadline.so.6':
file { '/usr/lib64/libreadline.so.7':
ensure => link,
owner => 'root',
group => 'root',
Expand Down
6 changes: 0 additions & 6 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
}
],
"operatingsystem_support": [
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"7"
]
},
{
"operatingsystem": "AlmaLinux",
"operatingsystemrelease": [
Expand Down
6 changes: 3 additions & 3 deletions spec/acceptance/basic_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
it { is_expected.to be_mode '755' } # serverspec does not like a leading 0
end

if fact('os.release.major') == '8'
describe file('/usr/lib64/libreadline.so.6') do
if fact('os.release.major') == '9'
describe file('/usr/lib64/libreadline.so.7') do
it { is_expected.to be_symlink }
it { is_expected.to be_linked_to 'libreadline.so.7.0' }
it { is_expected.to be_linked_to 'libreadline.so.8.1' }
it { is_expected.to be_owned_by 'root' }
it { is_expected.to be_grouped_into 'root' }
end
Expand Down
16 changes: 8 additions & 8 deletions spec/acceptance/daqsdk_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
%w[
/opt/lsst/daq-sdk
/opt/lsst/daq-sdk/dl
/opt/lsst/daq-sdk/R5-V3.2
/opt/lsst/daq-sdk/R5-V3.2/alinux
/opt/lsst/daq-sdk/R5-V3.2/examples
/opt/lsst/daq-sdk/R5-V3.2/include
/opt/lsst/daq-sdk/R5-V3.2/rtems
/opt/lsst/daq-sdk/R5-V3.2/x86
/opt/lsst/daq-sdk/R5-V10.3
/opt/lsst/daq-sdk/R5-V10.3/alinux
/opt/lsst/daq-sdk/R5-V10.3/examples
/opt/lsst/daq-sdk/R5-V10.3/include
/opt/lsst/daq-sdk/R5-V10.3/rtems
/opt/lsst/daq-sdk/R5-V10.3/x86
].each do |dir|
describe file(dir) do
it { is_expected.to be_directory }
Expand All @@ -31,12 +31,12 @@

describe file('/opt/lsst/daq-sdk/current') do
it { is_expected.to be_symlink }
it { is_expected.to be_linked_to 'R5-V3.2' }
it { is_expected.to be_linked_to 'R5-V10.3' }
it { is_expected.to be_owned_by 'root' }
it { is_expected.to be_grouped_into 'root' }
end

describe file('/opt/lsst/daq-sdk/dl/R5-V3.2.tgz') do
describe file('/opt/lsst/daq-sdk/dl/R5-V10.3.tgz') do
it { is_expected.to be_file }
it { is_expected.to be_owned_by 'root' }
it { is_expected.to be_grouped_into 'root' }
Expand Down
10 changes: 5 additions & 5 deletions spec/classes/daqsdk_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
end

it do
is_expected.to contain_archive('/opt/lsst/daq-sdk/dl/R5-V3.2.tgz').with(
source: 'https://repo-nexus.lsst.org/nexus/repository/daq/daq-sdk/R5-V3.2.tgz'
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'
)
end

it do
is_expected.to contain_file('/opt/lsst/daq-sdk/dl/R5-V3.2.tgz').with(
is_expected.to contain_file('/opt/lsst/daq-sdk/dl/R5-V10.3.tgz').with(
ensure: 'file',
mode: '0644',
owner: 'root',
Expand All @@ -49,7 +49,7 @@
end

it do
is_expected.to contain_file('/opt/lsst/daq-sdk/R5-V3.2').with(
is_expected.to contain_file('/opt/lsst/daq-sdk/R5-V10.3').with(
owner: 'root',
group: 'root',
recurse: true
Expand All @@ -61,7 +61,7 @@
ensure: 'link',
owner: 'root',
group: 'root',
target: 'R5-V3.2'
target: 'R5-V10.3'
)
end
end
Expand Down
Loading