Skip to content
This repository was archived by the owner on Nov 24, 2023. It is now read-only.

Commit 595da8e

Browse files
authored
Merge pull request #34 from Telefonica/fix_ensure_absent_instance
Fix ensure absent instance
2 parents ea714df + 3b881ee commit 595da8e

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

manifests/instance.pp

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,29 +129,34 @@
129129
require => Archive["${instance_name}-${archive_name}"],
130130
}
131131

132-
exec { "${instance_name}-check-runner-configured":
133-
user => $user,
134-
cwd => "${github_actions_runner::root_dir}/${instance_name}",
135-
command => 'true',
136-
unless => "test -f ${github_actions_runner::root_dir}/${instance_name}/runsvc.sh",
137-
path => ['/bin', '/usr/bin'],
138-
notify => Exec["${instance_name}-run_configure_install_runner.sh"],
132+
if $ensure == 'present' {
133+
exec { "${instance_name}-check-runner-configured":
134+
user => $user,
135+
cwd => '/srv',
136+
command => 'true',
137+
unless => "test -f ${github_actions_runner::root_dir}/${instance_name}/runsvc.sh",
138+
path => ['/bin', '/usr/bin'],
139+
notify => Exec["${instance_name}-run_configure_install_runner.sh"],
140+
}
139141
}
140142

141143
exec { "${instance_name}-ownership":
142144
user => $user,
143145
cwd => $github_actions_runner::root_dir,
144146
command => "/bin/chown -R ${user}:${group} ${github_actions_runner::root_dir}/${instance_name}",
145147
refreshonly => true,
146-
path => "/tmp/${instance_name}-${archive_name}",
147-
subscribe => Archive["${instance_name}-${archive_name}"]
148+
path => ['/bin', '/usr/bin'],
149+
subscribe => Archive["${instance_name}-${archive_name}"],
150+
onlyif => "test -d ${github_actions_runner::root_dir}/${instance_name}"
148151
}
149152

150153
exec { "${instance_name}-run_configure_install_runner.sh":
151154
user => $user,
152155
cwd => "${github_actions_runner::root_dir}/${instance_name}",
153156
command => "${github_actions_runner::root_dir}/${instance_name}/configure_install_runner.sh",
154-
refreshonly => true
157+
refreshonly => true,
158+
path => ['/bin', '/usr/bin'],
159+
onlyif => "test -d ${github_actions_runner::root_dir}/${instance_name}"
155160
}
156161

157162
$active_service = $ensure ? {

spec/classes/github_actions_runner_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,10 @@
379379
is_expected.to contain_file('/some_dir/actions-runner-2.272.0/first_runner/configure_install_runner.sh').with(
380380
'ensure' => 'absent',
381381
)
382+
383+
is_expected.not_to contain_exec('first_runner-check-runner-configured')
384+
is_expected.to contain_exec('first_runner-ownership')
385+
is_expected.to contain_exec('first_runner-run_configure_install_runner.sh')
382386
end
383387
end
384388

0 commit comments

Comments
 (0)