aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2018-06-03 13:09:25 +0100
committerChristopher Baines <mail@cbaines.net>2018-06-03 14:09:13 +0100
commit89f23d284796f51a0386c7127ee56be231189edd (patch)
treeaf2d2e1edb28251c6ffd7cd27c4c8695b305e945
parentf7642828314a5accf4221e0ebf0deb18ae6173e2 (diff)
downloadgovuk-mini-environment-admin-89f23d284796f51a0386c7127ee56be231189edd.tar
govuk-mini-environment-admin-89f23d284796f51a0386c7127ee56be231189edd.tar.gz
Use the run_remotely_on_host option in BuildJob
-rw-r--r--app/jobs/govuk_guix/build_job.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/jobs/govuk_guix/build_job.rb b/app/jobs/govuk_guix/build_job.rb
index c4da654..94acd70 100644
--- a/app/jobs/govuk_guix/build_job.rb
+++ b/app/jobs/govuk_guix/build_job.rb
@@ -37,8 +37,6 @@ class GovukGuix::BuildJob < GovukGuix::Job
remote_host = options[:run_remotely_on_host]
if remote_host
- ssh_command = ['ssh', remote_host]
-
# Copy the revision to the remote host, to ensure it's available
# there
run_command(
@@ -47,12 +45,9 @@ class GovukGuix::BuildJob < GovukGuix::Job
"--to=#{remote_host}",
mini_environment.govuk_guix_revision.store_path
)
- else
- ssh_command = []
end
output = run_command(
- *ssh_command,
"#{mini_environment.govuk_guix_revision.store_path}/bin/govuk",
'system',
'build',
@@ -60,7 +55,8 @@ class GovukGuix::BuildJob < GovukGuix::Job
DEFAULT_ARGUMENTS.merge(options[:arguments])
),
*signon_user_arguments(mini_environment.signon_users),
- *options[:services]
+ *options[:services],
+ run_remotely_on_host: remote_host
)
build_output = output.last.strip