Skip to content

Commit

Permalink
Merge pull request #4 from lsst-it/modulesync
Browse files Browse the repository at this point in the history
Update from voxpupuli modulesync_config
  • Loading branch information
cbarria committed Apr 5, 2024
2 parents decac47 + 71ee20c commit e66d276
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 16 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@

name: CI

"on": pull_request
"on":
pull_request: {}
push:
branches:
- main
- master

concurrency:
group: ${{ github.ref_name }}
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
.*.sw?
/.yardoc/
/Guardfile
bolt-debug.log
.rerun.json
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '7.1.0'
modulesync_config_version: '7.3.0'
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
case $facts['os']['family'] {
'RedHat': {
exec { 'install_anaconda':
command => "/bin/wget https://repo.anaconda.com/archive/${anaconda_version}-Linux-x86_64.sh -O /tmp/anaconda_installer.sh && /bin/bash /tmp/anaconda_installer.sh -b -p /opt/anaconda",
command => "curl -o /tmp/anaconda_installer.sh https://repo.anaconda.com/archive/${anaconda_version}-Linux-x86_64.sh && /bin/bash /tmp/anaconda_installer.sh -b -p /opt/anaconda",
creates => '/opt/anaconda/bin/conda',
path => '/usr/bin:/bin:/opt/anaconda/bin',
}
Expand Down
12 changes: 6 additions & 6 deletions spec/acceptance/basic_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
let(:manifest) do
<<-PP
class { 'anaconda':
anaconda_version => 'foo',
python_env_name => 'bar',
python_env_version => 'baz',
anaconda_version => 'Anaconda3-2023.07-2',
python_env_name => 'py311',
python_env_version => '3.11',
conda_packages => {
'qux' => {
'channel' => 'corge',
'version' => 'quux',
'pyside2' => {
'channel' => 'conda-forge',
'version' => '5.15.8',
},
},
}
Expand Down
8 changes: 1 addition & 7 deletions spec/classes/init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

it {
is_expected.to contain_exec('install_anaconda').with(
'command' => '/bin/wget https://repo.anaconda.com/archive/quux-Linux-x86_64.sh -O /tmp/anaconda_installer.sh && /bin/bash /tmp/anaconda_installer.sh -b -p /opt/anaconda'
'command' => 'curl -o /tmp/anaconda_installer.sh https://repo.anaconda.com/archive/quux-Linux-x86_64.sh && /bin/bash /tmp/anaconda_installer.sh -b -p /opt/anaconda'
)
}

Expand All @@ -61,12 +61,6 @@
'content' => 'source /opt/anaconda/bin/activate foo'
)
}

it {
is_expected.to contain_package('wget').with(
'ensure' => 'installed'
)
}
end
end
end
Expand Down

0 comments on commit e66d276

Please sign in to comment.