* [bug#36955] [PATCH] machine: Add 'build-locally?' field for managed hosts.
@ 2019-08-07 12:44 Jakob L. Kreuze
2019-08-07 19:20 ` Christopher Lemmer Webber
0 siblings, 1 reply; 4+ messages in thread
From: Jakob L. Kreuze @ 2019-08-07 12:44 UTC (permalink / raw)
To: 36955
[-- Attachment #1: Type: text/plain, Size: 2536 bytes --]
* gnu/machine/ssh.scm (machine-ssh-configuration-build-locally?): New
variable.
(managed-host-remote-eval): Pass 'build-locally?' to 'remote-eval'.
---
gnu/machine/ssh.scm | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index ae312597dd..1f16d9a5ea 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -47,6 +47,7 @@
machine-ssh-configuration
machine-ssh-configuration-host-name
+ machine-ssh-configuration-build-locally?
machine-ssh-configuration-port
machine-ssh-configuration-user
machine-ssh-configuration-session))
@@ -69,15 +70,17 @@
make-machine-ssh-configuration
machine-ssh-configuration?
this-machine-ssh-configuration
- (host-name machine-ssh-configuration-host-name) ; string
- (port machine-ssh-configuration-port ; integer
- (default 22))
- (user machine-ssh-configuration-user ; string
- (default "root"))
- (identity machine-ssh-configuration-identity ; path to a private key
- (default #f))
- (session machine-ssh-configuration-session ; session
- (default #f)))
+ (host-name machine-ssh-configuration-host-name) ; string
+ (build-locally? machine-ssh-configuration-build-locally?
+ (default #t))
+ (port machine-ssh-configuration-port ; integer
+ (default 22))
+ (user machine-ssh-configuration-user ; string
+ (default "root"))
+ (identity machine-ssh-configuration-identity ; path to a private key
+ (default #f))
+ (session machine-ssh-configuration-session ; session
+ (default #f)))
(define (machine-ssh-session machine)
"Return the SSH session that was given in MACHINE's configuration, or create
@@ -103,7 +106,10 @@ one from the configuration's parameters if one was not provided."
"Internal implementation of 'machine-remote-eval' for MACHINE instances with
an environment type of 'managed-host."
(maybe-raise-unsupported-configuration-error machine)
- (remote-eval exp (machine-ssh-session machine)))
+ (remote-eval exp (machine-ssh-session machine)
+ #:build-locally?
+ (machine-ssh-configuration-build-locally?
+ (machine-configuration machine))))
\f
;;;
--
2.22.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread* [bug#36955] [PATCH] machine: Add 'build-locally?' field for managed hosts.
2019-08-07 12:44 [bug#36955] [PATCH] machine: Add 'build-locally?' field for managed hosts Jakob L. Kreuze
@ 2019-08-07 19:20 ` Christopher Lemmer Webber
2019-08-07 20:47 ` Jakob L. Kreuze
0 siblings, 1 reply; 4+ messages in thread
From: Christopher Lemmer Webber @ 2019-08-07 19:20 UTC (permalink / raw)
To: 36955
Looks good, though I assume this is a dependency for another patch
that's coming?
Jakob L. Kreuze writes:
> * gnu/machine/ssh.scm (machine-ssh-configuration-build-locally?): New
> variable.
> (managed-host-remote-eval): Pass 'build-locally?' to 'remote-eval'.
> ---
> gnu/machine/ssh.scm | 26 ++++++++++++++++----------
> 1 file changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
> index ae312597dd..1f16d9a5ea 100644
> --- a/gnu/machine/ssh.scm
> +++ b/gnu/machine/ssh.scm
> @@ -47,6 +47,7 @@
> machine-ssh-configuration
>
> machine-ssh-configuration-host-name
> + machine-ssh-configuration-build-locally?
> machine-ssh-configuration-port
> machine-ssh-configuration-user
> machine-ssh-configuration-session))
> @@ -69,15 +70,17 @@
> make-machine-ssh-configuration
> machine-ssh-configuration?
> this-machine-ssh-configuration
> - (host-name machine-ssh-configuration-host-name) ; string
> - (port machine-ssh-configuration-port ; integer
> - (default 22))
> - (user machine-ssh-configuration-user ; string
> - (default "root"))
> - (identity machine-ssh-configuration-identity ; path to a private key
> - (default #f))
> - (session machine-ssh-configuration-session ; session
> - (default #f)))
> + (host-name machine-ssh-configuration-host-name) ; string
> + (build-locally? machine-ssh-configuration-build-locally?
> + (default #t))
> + (port machine-ssh-configuration-port ; integer
> + (default 22))
> + (user machine-ssh-configuration-user ; string
> + (default "root"))
> + (identity machine-ssh-configuration-identity ; path to a private key
> + (default #f))
> + (session machine-ssh-configuration-session ; session
> + (default #f)))
>
> (define (machine-ssh-session machine)
> "Return the SSH session that was given in MACHINE's configuration, or create
> @@ -103,7 +106,10 @@ one from the configuration's parameters if one was not provided."
> "Internal implementation of 'machine-remote-eval' for MACHINE instances with
> an environment type of 'managed-host."
> (maybe-raise-unsupported-configuration-error machine)
> - (remote-eval exp (machine-ssh-session machine)))
> + (remote-eval exp (machine-ssh-session machine)
> + #:build-locally?
> + (machine-ssh-configuration-build-locally?
> + (machine-configuration machine))))
>
> \f
> ;;;
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#36955] [PATCH] machine: Add 'build-locally?' field for managed hosts.
2019-08-07 19:20 ` Christopher Lemmer Webber
@ 2019-08-07 20:47 ` Jakob L. Kreuze
2019-08-07 22:29 ` bug#36955: " Christopher Lemmer Webber
0 siblings, 1 reply; 4+ messages in thread
From: Jakob L. Kreuze @ 2019-08-07 20:47 UTC (permalink / raw)
To: Christopher Lemmer Webber; +Cc: 36955
[-- Attachment #1: Type: text/plain, Size: 297 bytes --]
Hi Chris,
Christopher Lemmer Webber <cwebber@dustycloud.org> writes:
> Looks good, though I assume this is a dependency for another patch
> that's coming?
Nah, this is standalone. Just so there's an option to offload the builds
when deploying to particularly capable machines.
Regards,
Jakob
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#36955: [PATCH] machine: Add 'build-locally?' field for managed hosts.
2019-08-07 20:47 ` Jakob L. Kreuze
@ 2019-08-07 22:29 ` Christopher Lemmer Webber
0 siblings, 0 replies; 4+ messages in thread
From: Christopher Lemmer Webber @ 2019-08-07 22:29 UTC (permalink / raw)
To: Jakob L. Kreuze; +Cc: 36955-done
Jakob L. Kreuze writes:
> Hi Chris,
>
> Christopher Lemmer Webber <cwebber@dustycloud.org> writes:
>
>> Looks good, though I assume this is a dependency for another patch
>> that's coming?
>
> Nah, this is standalone. Just so there's an option to offload the builds
> when deploying to particularly capable machines.
>
> Regards,
> Jakob
Ok, thanks for the clarity. Merged and pushed!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-07 22:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-07 12:44 [bug#36955] [PATCH] machine: Add 'build-locally?' field for managed hosts Jakob L. Kreuze
2019-08-07 19:20 ` Christopher Lemmer Webber
2019-08-07 20:47 ` Jakob L. Kreuze
2019-08-07 22:29 ` bug#36955: " Christopher Lemmer Webber
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).