Fix a bug where only the first test server gets built and run

environment/aws/topology_setup/setup_topology.py

@@ -679,10 +679,12 @@ def run_test_servers(self):
             bridge.run(test_server_input.location)
             port = 5555 if test_server_input.platform.startswith("dotnet") else 8080
             ip = bridge.get_ip(test_server_input.location)
+
+            success = False
             for _ in range(0, 30):
                 try:
                     requests.get(f"http://{ip}:{port}")
-                    return
+                    success = True
                 except requests.exceptions.ConnectionError:
                     click.secho(
                         f"Failed to connect to test server at {ip}:{port}, retrying in 1s...",
@@ -691,9 +693,10 @@ def run_test_servers(self):
                     sleep(1)
                     pass
 
-            raise RuntimeError(
-                f"Test server failed to start at {test_server_input.location}"
-            )
+            if not success:
+                raise RuntimeError(
+                    f"Test server failed to start at {test_server_input.location}"
+                )
 
     def stop_test_servers(self):
         """

jenkins/pipelines/shared/setup_test.py

@@ -121,8 +121,10 @@ def setup_test(
             },
         }
         topology["tag"] = topology_tag
-        topology["test_servers"][0]["cbl_version"] = cbl_version
-        topology["test_servers"][0]["dataset_version"] = dataset_version
+        for ts in topology["test_servers"]:
+            ts["cbl_version"] = cbl_version
+            ts["dataset_version"] = dataset_version
+
         with open(topology_file_out, "w") as fout:
             json.dump(topology, fout, indent=4)