Skip to content

Commit

Permalink
drop rvm module
Browse files Browse the repository at this point in the history
  • Loading branch information
evgeni committed May 14, 2024
1 parent f7d589a commit 8ffb38a
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 94 deletions.
2 changes: 0 additions & 2 deletions puppet/Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ moduledir 'external_modules'

mod 'citrin/htpasswd', '1.0.2'
mod 'claranet/timezone', '2.0.1'
mod 'golja/gnupg', '1.2.3'
mod 'puppet/archive', '7.1.0'
mod 'puppet/augeasproviders_core', '4.1.0'
mod 'puppet/augeasproviders_mounttab', '4.0.0'
Expand All @@ -17,7 +16,6 @@ mod 'puppet/mosquitto', '2.1.0'
mod 'puppet/nodejs', '10.0.0'
mod 'puppet/pbuilder', '2.0.0'
mod 'puppet/redis', '10.0.0'
mod 'puppet/rvm', '3.0.0'
mod 'puppet/selinux', '4.1.0'
mod 'puppet/systemd', '6.6.0'
mod 'puppet/unattended_upgrades', '8.1.0'
Expand Down
6 changes: 1 addition & 5 deletions puppet/modules/jenkins_node/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,6 @@
}

file { '/etc/cron.daily/jenkins_cleaner':
ensure => file,
owner => 'root',
group => 'root',
mode => '0755',
content => "#!/bin/sh\nfind ${workspace} /usr/local/rvm/gems/ -maxdepth 1 -mindepth 1 -type d -user jenkins -ctime +3 -exec rm -rf {} +\n", # lint:ignore:140chars
ensure => absent,
}
}
47 changes: 0 additions & 47 deletions puppet/modules/jenkins_node/manifests/rvm.pp

This file was deleted.

29 changes: 0 additions & 29 deletions puppet/modules/jenkins_node/manifests/rvm_config.pp

This file was deleted.

5 changes: 0 additions & 5 deletions puppet/modules/jenkins_node/manifests/unittests.pp
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,6 @@
# Databases
include jenkins_node::postgresql

# RVM
if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] != '9' {
include jenkins_node::rvm
}

# rbenv
if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] != '7' {
include jenkins_node::rbenv
Expand Down
6 changes: 1 addition & 5 deletions puppet/spec/classes/jenkins_node_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
end
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_class('jenkins_node::packaging') }
it { is_expected.not_to contain_class('jenkins_node::rvm') }
it { is_expected.not_to contain_class('jenkins_node::rbenv') }
it { is_expected.to contain_package('jq') }
end

Expand All @@ -62,10 +62,6 @@
if ['9', '8'].include?(facts[:operatingsystemrelease])
it { is_expected.to contain_class('jenkins_node::rbenv') }
end

if ['8', '7'].include?(facts[:operatingsystemrelease])
it { is_expected.to contain_class('jenkins_node::rvm') }
end
end
end
end
Expand Down
1 change: 0 additions & 1 deletion puppet/spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
include RspecPuppetFacts

add_custom_fact :root_home, '/root'
add_custom_fact :rvm_installed, false
add_custom_fact :service_provider, 'systemd'
add_custom_fact :sudoversion, '1.8.23'

Expand Down

0 comments on commit 8ffb38a

Please sign in to comment.