CI fix

Author: Joe-Abraham

presto-native-execution/src/test/java/com/facebook/presto/nativeworker/ContainerQueryRunner.java

@@ -197,7 +197,7 @@ protected GenericContainer<?> createFunctionServer()
                 .withNetworkAliases("presto-function-server")
                 .withCopyFileToContainer(MountableFile.forHostPath(BASE_DIR + "/testcontainers/function-server/etc"), "/opt/function-server/etc")
                 .withCopyFileToContainer(MountableFile.forHostPath(BASE_DIR + "/testcontainers/function-server/entrypoint.sh"), "/opt/entrypoint.sh")
-                .waitingFor(Wait.forLogMessage(".* STARTED .*", 1))
+                .waitingFor(Wait.forLogMessage(".*======== REMOTE FUNCTION SERVER STARTED at: .*", 1))
                 .withStartupTimeout(Duration.ofSeconds(Long.parseLong(CONTAINER_TIMEOUT)))
                 .withExposedPorts(functionServerPort);
     }

presto-native-execution/src/test/java/com/facebook/presto/nativeworker/ContainerQueryRunnerUtils.java

@@ -193,7 +193,10 @@ public static void createCoordinatorEntryPointScript()
     {
         String scriptContent = "#!/bin/sh\n" +
                 "set -e\n" +
-                "$PRESTO_HOME/bin/launcher run\n";
+                "trap 'kill -TERM $app 2>/dev/null' TERM\n" +
+                "$PRESTO_HOME/bin/launcher run &\n" +
+                "app=$!\n" +
+                "wait $app";
         createScriptFile("testcontainers/coordinator/entrypoint.sh", scriptContent);
     }
 
@@ -203,11 +206,8 @@ public static void createFunctionServerEntryPointScript()
         String scriptContent = "#!/bin/sh\n" +
                 "set -e\n" +
                 "trap 'kill -TERM $app 2>/dev/null' TERM\n\n" +
-                "# Start Function Server\n" +
                 "java -Dconfig=/opt/function-server/etc/config.properties " +
                 "-jar /opt/presto-function-server-executable.jar &\n" +
-                "app=$!\n\n" +
-                "# Wait for Function Server process to exit\n" +
                 "wait $app\n";
 
         createScriptFile("testcontainers/function-server/entrypoint.sh", scriptContent);