Make Genie agent container's entry point and command dynamic

genie-docs/src/docs/asciidoc/_properties.adoc

@@ -190,7 +190,7 @@ https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-featu
 |genie.agent.launcher.titus.command-template
 |The container command array, placeholder values are substituted at runtime
 |[exec, --api-job, --launchInJobDirectory, --job-id, <JOB_ID>, --server-host, <SERVER_HOST>, --server-port, <SERVER_PORT>]
-|no
+|yes
 
 |genie.agent.launcher.titus.container-attributes
 |Map attributes to send to Titus specific to the container
@@ -215,7 +215,7 @@ https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-featu
 |genie.agent.launcher.titus.entry-point-template
 |The container entry point array, placeholder values are substituted at runtime
 |[/bin/genie-agent]
-|no
+|yes
 
 |genie.agent.launcher.titus.genie-server-host
 |The hostname of the Genie server or cluster for the agent to connect to

genie-web/src/main/java/com/netflix/genie/web/agent/launchers/impl/TitusAgentLauncherImpl.java

@@ -261,11 +261,17 @@ private TitusBatchJobRequest createJobRequest(final ResolvedJob resolvedJob) thr
 
         // Substitute all placeholders with their values for the container entry point and command
         final List<String> entryPoint = REPLACE_PLACEHOLDERS.apply(
-            this.titusAgentLauncherProperties.getEntryPointTemplate(),
+            this.binder
+                .bind(
+                    TitusAgentLauncherProperties.ENTRY_POINT_TEMPLATE,
+                    Bindable.listOf(String.class))
+                .orElse(this.titusAgentLauncherProperties.getEntryPointTemplate()),
             placeholdersMap
         );
         final List<String> command = REPLACE_PLACEHOLDERS.apply(
-            this.titusAgentLauncherProperties.getCommandTemplate(),
+            this.binder
+                .bind(TitusAgentLauncherProperties.COMMAND_TEMPLATE, Bindable.listOf(String.class))
+                .orElse(this.titusAgentLauncherProperties.getCommandTemplate()),
             placeholdersMap
         );
         final Duration runtimeLimit = this.titusAgentLauncherProperties.getRuntimeLimit();

genie-web/src/main/java/com/netflix/genie/web/properties/TitusAgentLauncherProperties.java

@@ -94,6 +94,11 @@ public class TitusAgentLauncherProperties {
      */
     public static final String CAPACITY_GROUP_PROPERTY = PREFIX + ".capacityGroup";
 
+    /**
+     * The container command template array, placeholder values are substituted at runtime.
+     */
+    public static final String COMMAND_TEMPLATE = PREFIX + ".command-template";
+
     /**
      * Any attributes that should be added to the request specifically for the container.
      */
@@ -104,6 +109,11 @@ public class TitusAgentLauncherProperties {
      */
     public static final String ENABLE_PROPERTY = PREFIX + ".enabled";
 
+    /**
+     * The container entry point template array, placeholder values are substituted at runtime.
+     */
+    public static final String ENTRY_POINT_TEMPLATE = PREFIX + ".entry-point-template";
+
     /**
      * The name of the property that dictates which image to launch on Titus with.
      */

genie-web/src/test/groovy/com/netflix/genie/web/agent/launchers/impl/TitusAgentLauncherImplSpec.groovy

@@ -273,6 +273,60 @@ class TitusAgentLauncherImplSpec extends Specification {
         return new ObjectMapper().readValue(s, TitusBatchJobResponse.class)
     }
 
+    def "Check container entrypoint and command resolution"() {
+        TitusBatchJobResponse response = toTitusResponse("{ \"id\" : \"" + TITUS_JOB_ID + "\" }")
+        TitusBatchJobRequest requestCapture
+
+        when:
+        Optional<JsonNode> launcherExt = launcher.launchAgent(resolvedJob, null)
+
+        then:
+        1 * restTemplate.postForObject(TITUS_ENDPOINT, _ as TitusBatchJobRequest, TitusBatchJobResponse.class) >> {
+            args ->
+                requestCapture = args[1] as TitusBatchJobRequest
+                return response
+        }
+        1 * adapter.modifyJobRequest(_ as TitusBatchJobRequest, resolvedJob)
+        1 * cache.put(JOB_ID, TITUS_JOB_ID)
+        launcherExt.isPresent()
+        requestCapture != null
+        requestCapture.getContainer().getEntryPoint() == ["/bin/genie-agent"]
+        requestCapture.getContainer().getCommand() == [
+            "exec",
+            "--api-job",
+            "--launchInJobDirectory",
+            "--job-id", JOB_ID,
+            "--server-host", launcherProperties.getGenieServerHost(),
+            "--server-port", launcherProperties.getGenieServerPort().toString()
+        ]
+
+        when:
+        def entryPointTemplate = ["my", "entrypoint"]
+        def commandTemplate = ["my", "command"]
+        environment.withProperty(
+            TitusAgentLauncherProperties.ENTRY_POINT_TEMPLATE,
+            entryPointTemplate.join(",")
+        )
+        environment.withProperty(
+            TitusAgentLauncherProperties.COMMAND_TEMPLATE,
+            commandTemplate.join(",")
+        )
+        launcherExt = launcher.launchAgent(resolvedJob, null)
+
+        then:
+        1 * restTemplate.postForObject(TITUS_ENDPOINT, _ as TitusBatchJobRequest, TitusBatchJobResponse.class) >> {
+            args ->
+                requestCapture = args[1] as TitusBatchJobRequest
+                return response
+        }
+        1 * adapter.modifyJobRequest(_ as TitusBatchJobRequest, resolvedJob)
+        1 * cache.put(JOB_ID, TITUS_JOB_ID)
+        launcherExt.isPresent()
+        requestCapture != null
+        requestCapture.getContainer().getEntryPoint() == entryPointTemplate
+        requestCapture.getContainer().getCommand() == commandTemplate
+    }
+
     @Unroll
     def "Check memory allocation logic"() {
         if (envMinimumMemory != null) {