Deployment and lifecycle management for Nix
e2e: drop client to indicate its support
+53
-54
+1
-1
nix/nixos/module.nix
+1
-1
nix/nixos/module.nix
+3
-1
nix/nixos/server.nix
+3
-1
nix/nixos/server.nix
···
116
116
environment = {
117
117
HOME = "%S/sower";
118
118
PHX_SERVER = "true";
119
+
SHELL = lib.getExe pkgs.bash;
119
120
SOWER_SERVER_CONFIG_FILE = config-file;
120
-
} // cfg.environment;
121
+
}
122
+
// cfg.environment;
121
123
};
122
124
123
125
systemd.services.sower-init-secrets = lib.mkIf cfg.initSecrets {
+49
-52
nix/tests/e2e.nix
+49
-52
nix/tests/e2e.nix
···
38
38
39
39
environment.systemPackages = [
40
40
flake.packages.${pkgs.stdenv.hostPlatform.system}.seed-ci
41
-
41
+
flake.packages.${pkgs.stdenv.hostPlatform.system}.cli
42
42
];
43
43
44
44
networking.firewall.allowedTCPPorts = [ 4000 ];
···
50
50
connect-timeout = 1;
51
51
};
52
52
53
-
services.sower.client = {
54
-
enable = true;
55
-
package = flake.packages.${pkgs.stdenv.hostPlatform.system}.cli;
56
-
57
-
settings = {
58
-
api-token-file = "/run/sower/test_token";
59
-
debug = true;
60
-
endpoint = "http://localhost:4000";
61
-
62
-
services.services = [
63
-
"simple-service"
64
-
];
65
-
};
66
-
};
53
+
# services.sower.client = {
54
+
# enable = true;
55
+
# package = flake.packages.${pkgs.stdenv.hostPlatform.system}.cli;
56
+
#
57
+
# settings = {
58
+
# api-token-file = "/run/sower/test_token";
59
+
# debug = true;
60
+
# endpoint = "http://localhost:4000";
61
+
#
62
+
# services.services = [
63
+
# "simple-service"
64
+
# ];
65
+
# };
66
+
# };
67
67
68
68
services.sower.server = {
69
69
enable = true;
···
112
112
113
113
};
114
114
115
-
client = {
116
-
imports = [
117
-
../nixos/module.nix
118
-
];
119
-
120
-
services.sower.client = {
121
-
enable = true;
122
-
package = flake.packages.${pkgs.stdenv.hostPlatform.system}.cli;
123
-
124
-
settings = {
125
-
api-token-file = "/run/sower/test_token";
126
-
endpoint = "http://server:4000";
127
-
debug = true;
128
-
};
129
-
};
130
-
131
-
virtualisation.additionalPaths = [
132
-
simple-service
133
-
];
134
-
};
115
+
# client = {
116
+
# imports = [
117
+
# ../nixos/module.nix
118
+
# ];
119
+
#
120
+
# services.sower.client = {
121
+
# enable = true;
122
+
# package = flake.packages.${pkgs.stdenv.hostPlatform.system}.cli;
123
+
#
124
+
# settings = {
125
+
# api-token-file = "/run/sower/test_token";
126
+
# endpoint = "http://server:4000";
127
+
# debug = true;
128
+
# };
129
+
# };
130
+
#
131
+
# virtualisation.additionalPaths = [
132
+
# simple-service
133
+
# ];
134
+
# };
135
135
};
136
136
137
137
testScript = # python
···
141
141
server.wait_for_unit("sower.service")
142
142
server.wait_for_open_port(4000)
143
143
144
-
with subtest("basic submission"):
145
-
server_profile = server.succeed("readlink -f /run/booted-system").strip()
146
-
server.succeed(f"sower seed submit --path {server_profile} --debug")
147
-
148
-
client_profile = client.succeed("readlink -f /run/booted-system").strip()
149
-
server.succeed(f"sower seed submit --name client --type nixos --path {client_profile} --debug")
150
-
151
-
server.succeed("sower seed submit --name simple-service --type service --path ${simple-service} --debug")
152
-
153
-
with subtest("activate seed"):
154
-
server.succeed("sower seed upgrade --debug")
144
+
# with subtest("basic submission"):
145
+
# server_profile = server.succeed("readlink -f /run/booted-system").strip()
146
+
# server.succeed(f"sower seed submit --path {server_profile} --debug")
147
+
#
148
+
# server.succeed("sower seed submit --name simple-service --type service --path ${simple-service} --debug")
149
+
#
150
+
# with subtest("activate seed"):
151
+
# server.succeed("sower seed upgrade --debug")
155
152
156
153
# with subtest("activate services"):
157
154
# server.succeed("sower services upgrade --debug")
158
155
# server.wait_for_unit("simple-oneshot.service")
159
156
# server.wait_for_unit("simple-sleep.service")
160
157
161
-
with subtest("check bootstrap"):
162
-
token = server.succeed("cat /run/sower/test_token")
163
-
client.succeed("mkdir /run/sower")
164
-
client.succeed(f"echo -n {token} > /run/sower/test_token")
165
-
166
-
client.succeed("curl http://server:4000/client/bootstrap | SOWER_ENDPOINT=http://server:4000 bash -s seed info --name client --type nixos")
158
+
# with subtest("check bootstrap"):
159
+
# token = server.succeed("cat /run/sower/test_token")
160
+
# client.succeed("mkdir /run/sower")
161
+
# client.succeed(f"echo -n {token} > /run/sower/test_token")
162
+
#
163
+
# client.succeed("curl http://server:4000/client/bootstrap | SOWER_ENDPOINT=http://server:4000 bash -s seed info --name client --type nixos")
167
164
'';
168
165
}