diff --git a/tools/dashboard-stage-test.py b/tools/dashboard-stage-test.py index f04fa0ff03b5bac8c36ce97edd452f0750ae215f..7d8532dacfdd972258b5fbb0e0dbeadae85d59ff 100644 --- a/tools/dashboard-stage-test.py +++ b/tools/dashboard-stage-test.py @@ -113,9 +113,14 @@ class PreviewProof(unittest.TestCase): def exists(path): return str(path).startswith("/run/snowglobe-preview/") and path.name == "host.sock" or original_exists(path) - with patch.object(stage.snowglobe, "STATE", state), patch.object(stage.snowglobe, "REPO", root / "releases/1234567890abcdef"), patch.object(stage.snowglobe, "token"), patch.object(stage.snowglobe, "identity", return_value=os.getuid()), patch.object(stage.snowglobe, "check_staging_pool"), patch.object(stage.snowglobe, "check_http"), patch.object(stage.snowglobe, "command", side_effect=command), patch.object(stage.subprocess, "run", side_effect=run), patch.object(stage.os, "chown") as chown, patch.object(stage.snowglobe.transition, "host_environment", return_value="PATH=/bin"), patch.object(stage.snowglobe.transition, "stop_preview"), patch.object(Path, "exists", exists), redirect_stdout(io.StringIO()): + with patch.object(stage.snowglobe, "STATE", state), patch.object(stage.snowglobe, "REPO", root / "releases/1234567890abcdef"), patch.object(stage.snowglobe, "token"), patch.object(stage.snowglobe, "identity", return_value=os.getuid()), patch.object(stage.snowglobe, "check_staging_pool"), patch.object(stage.snowglobe, "check_http") as check_http, patch.object(stage.snowglobe, "command", side_effect=command), patch.object(stage.subprocess, "run", side_effect=run), patch.object(stage.os, "chown") as chown, patch.object(stage.snowglobe.transition, "host_environment", return_value="PATH=/bin"), patch.object(stage.snowglobe.transition, "stop_preview"), patch.object(Path, "exists", exists), redirect_stdout(io.StringIO()): stage.stage() + check_http.assert_called_once_with(jobs[-1]["ID"] + ".fixture.test", "/sign-in", True) task = jobs[-1]["TaskGroups"][0]["Tasks"][0] + check = jobs[-1]["TaskGroups"][0]["Services"][0]["Checks"][0] + self.assertEqual(check["Type"], "tcp") + self.assertNotIn("Path", check) + self.assertNotIn("Header", check) directory = root / "srv/staging" / jobs[-1]["ID"] proof = directory / "proxy.token" value = proof.read_text() diff --git a/tools/dashboard-stage.py b/tools/dashboard-stage.py index d9c052a5fd52fc6330f859e761f7877f043cb49f..0aed836a0303aa3d0b8cd100909ddf9d1eb0a14b 100644 --- a/tools/dashboard-stage.py +++ b/tools/dashboard-stage.py @@ -174,7 +174,7 @@ def stage(): "Meta": {"snowglobe_service": "dashboard", "snowglobe_name": "Snow Globe preview", "snowglobe_hostname": hostname}, "TaskGroups": [{"Name": "app", "Count": 1, "Networks": [{"Mode": "host", "DynamicPorts": [{"Label": "http", "HostNetwork": "loopback"}]}], "Services": [{"Name": identity, "Provider": "nomad", "PortLabel": "http", "TaskName": "app", "Tags": ["caddy-host=" + hostname], - "Checks": [{"Name": "Dashboard sign-in", "Type": "http", "Path": "/sign-in", "Interval": 10000000000, "Timeout": 5000000000}]}], + "Checks": [{"Name": "Dashboard listener", "Type": "tcp", "Interval": 10000000000, "Timeout": 5000000000}]}], "Tasks": [{"Name": "app", "Driver": "podman", "User": str(saved["uid"]) + ":" + str(saved["uid"]), "Env": env, "Config": {"image": image, "network_mode": "host", "cap_drop": ["ALL"], "security_opt": ["no-new-privileges"], "volumes": [str(root / "data") + ":/data:rw", str(root / "files") + ":/srv:rw,rslave", runtime + ":/run/snowglobe-host:ro",