|
75 | 75 | nodes.server = serverConfig; |
76 | 76 | nodes.builder = builderConfig; |
77 | 77 | testScript = '' |
78 | | - server.wait_for_job("hydra-init") |
79 | | - server.wait_for_job("hydra-server") |
80 | | - server.wait_for_job("hydra-evaluator") |
81 | | - server.wait_for_job("hydra-queue-runner-dev") |
82 | | - builder.wait_for_job("hydra-queue-builder-dev") |
| 78 | + server.wait_for_unit("hydra-init.service") |
| 79 | + server.wait_for_unit("hydra-server.service") |
| 80 | + server.wait_for_unit("hydra-evaluator.service") |
| 81 | + server.wait_for_unit("hydra-queue-runner-dev.service") |
| 82 | + builder.wait_for_unit("hydra-queue-builder-dev.service") |
83 | 83 | server.wait_for_open_port(3000) |
84 | 84 | server.succeed("curl --fail http://localhost:3000/") |
85 | 85 | ''; |
|
104 | 104 | testScript = |
105 | 105 | { nodes, ... }: |
106 | 106 | '' |
107 | | - server.wait_for_job("hydra-init") |
108 | | - server.wait_for_job("hydra-queue-runner-dev") |
109 | | - builder.wait_for_job("hydra-queue-builder-dev") |
| 107 | + server.wait_for_unit("hydra-init.service") |
| 108 | + server.wait_for_unit("hydra-queue-runner-dev.service") |
| 109 | + builder.wait_for_unit("hydra-queue-builder-dev.service") |
110 | 110 |
|
111 | 111 | # Create an admin account and some other state. |
112 | 112 | server.succeed( |
|
121 | 121 | ) |
122 | 122 |
|
123 | 123 | # Wait until InfluxDB can receive web requests |
124 | | - server.wait_for_job("influxdb") |
| 124 | + server.wait_for_unit("influxdb.service") |
125 | 125 | server.wait_for_open_port(8086) |
126 | 126 |
|
127 | 127 | # Create an InfluxDB database where hydra will write to |
|
131 | 131 | ) |
132 | 132 |
|
133 | 133 | # Wait until hydra-server can receive HTTP requests |
134 | | - server.wait_for_job("hydra-server") |
| 134 | + server.wait_for_unit("hydra-server.service") |
135 | 135 | server.wait_for_open_port(3000) |
136 | 136 |
|
137 | 137 | # Setup the project and jobset |
|
301 | 301 | server.start() |
302 | 302 | builder.start() |
303 | 303 | server.wait_for_unit("multi-user.target") |
304 | | - server.wait_for_job("hydra-queue-runner-dev") |
305 | | - builder.wait_for_job("hydra-queue-builder-dev") |
| 304 | + server.wait_for_unit("hydra-queue-runner-dev.service") |
| 305 | + builder.wait_for_unit("hydra-queue-builder-dev.service") |
306 | 306 | server.wait_for_open_port(3000) |
307 | 307 | server.wait_for_open_port(3001) |
308 | 308 |
|
|
0 commit comments