Merged PR 334565: Standalone (CI/CD): Run single unit test on Docker in DPF TFS CI/CD

Related work items: #686632, #687137

Author: anslpa

ansys/dpf/core/server.py

@@ -325,7 +325,10 @@ def get_or_create_server(server):
 
 def _find_port_available_for_docker_bind(port):
     run_cmd = "docker ps --all"
-    process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    if os.name == 'posix':
+        process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    else:
+        process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     used_ports = []
     for line in io.TextIOWrapper(process.stdout, encoding="utf-8"):
         if not ("CONTAINER ID" in line):

ansys/dpf/core/server_types.py

@@ -90,26 +90,19 @@ def _verify_ansys_path_is_valid(ansys_path, executable, path_in_install = None):
 
 
 def _run_launch_server_process(ansys_path, ip, port, docker_name):
+    bShell = False
     if docker_name:
         docker_server_port = int(os.environ.get("DOCKER_SERVER_PORT", port))
         dpf_run_dir = os.getcwd()
         from ansys.dpf.core import LOCAL_DOWNLOADED_EXAMPLES_PATH
-        if os.name == "nt":
-            run_cmd = f"docker run -d -p {port}:{docker_server_port} " \
-                      f"{RUNNING_DOCKER['args']} " \
-                      f'-v "{LOCAL_DOWNLOADED_EXAMPLES_PATH}:/tmp/downloaded_examples" ' \
-                      f"-e DOCKER_SERVER_PORT={docker_server_port} " \
-                      f"--expose={docker_server_port} " \
-                      f"{docker_name}"
-        else:
-            run_cmd = ["docker run",
-                       "-d",
-                       f"-p" + f"{port}:{docker_server_port}",
-                       RUNNING_DOCKER['args'],
-                       f'-v "{LOCAL_DOWNLOADED_EXAMPLES_PATH}:/tmp/downloaded_examples"'
-                       f"-e DOCKER_SERVER_PORT={docker_server_port}",
-                       f"--expose={docker_server_port}",
-                       docker_name]
+        if os.name == "posix":
+            bShell = True
+        run_cmd = f"docker run -d -p {port}:{docker_server_port} " \
+                  f"{RUNNING_DOCKER['args']} " \
+                  f'-v "{LOCAL_DOWNLOADED_EXAMPLES_PATH}:/tmp/downloaded_examples" ' \
+                  f"-e DOCKER_SERVER_PORT={docker_server_port} " \
+                  f"--expose={docker_server_port} " \
+                  f"{docker_name}"
     else:
         if os.name == "nt":
             executable = "Ans.Dpf.Grpc.bat"
@@ -122,7 +115,10 @@ def _run_launch_server_process(ansys_path, ip, port, docker_name):
 
     old_dir = os.getcwd()
     os.chdir(dpf_run_dir)
-    process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    if not bShell:
+        process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    else:
+        process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     os.chdir(old_dir)
     return process
 
@@ -153,8 +149,23 @@ def launch_dpf(ansys_path, ip=LOCALHOST, port=DPF_DEFAULT_PORT, timeout=10, dock
     process : subprocess.Popen
         DPF Process.
     """
+    from ansys.dpf.core.server import port_in_use
+
     process = _run_launch_server_process(ansys_path, ip, port, docker_name)
 
+    if docker_name is not None and os.name == 'posix':
+        run_cmd = "docker ps --all"
+        process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        used_ports = []
+        for line in io.TextIOWrapper(process.stdout, encoding="utf-8"):
+            if not ("CONTAINER ID" in line):
+                split = line.split("0.0.0.0:")
+                if len(split) > 1:
+                    used_port = int(split[1].split("-")[0])
+                    if used_port == port:
+                        docker_id = split[0].split(" ")[0]
+                        return docker_id
+
     # check to see if the service started
     lines = []
     docker_id = []
@@ -832,17 +843,26 @@ def info(self):
 
     def shutdown(self):
         if self._own_process and self.live:
+            bShell = False
+            if os.name == 'posix':
+                bShell = True
             try:
                 self._preparing_shutdown_func[0](self._preparing_shutdown_func[1])
             except Exception as e:
                 warnings.warn("couldn't prepare shutdown: " + str(e.args))
             if self.on_docker:
                 run_cmd = f"docker stop {self._server_id}"
-                process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                if bShell:
+                    process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+                else:
+                    process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 run_cmd = f"docker rm {self._server_id}"
                 for line in io.TextIOWrapper(process.stdout, encoding="utf-8"):
                     pass
-                process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                if bShell:
+                    process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+                else:
+                    process = subprocess.Popen(run_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             elif self._remote_instance:
                 self._remote_instance.delete()
             else: