fix(titus): Set cmd when not empty for titus jobs (#4637)

spinnaker · May 30, 2020 · 478c6ed · 478c6ed
1 parent 0110556
commit 478c6ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.../src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/model/JobDescription.java b/.../src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/model/JobDescription.java
@@ -550,7 +550,7 @@ public JobDescriptor getGrpcJobDescriptor() {
       containerBuilder.addEntryPoint(entryPoint);
     }
 
-    if (cmd != null || !cmd.isEmpty()) {
+    if (cmd != null && !cmd.isEmpty()) {
       containerBuilder.addCommand(cmd);
     }
 

diff --git a/...vy/com/netflix/spinnaker/clouddriver/titus/deploy/description/TitusDeployDescription.java b/...vy/com/netflix/spinnaker/clouddriver/titus/deploy/description/TitusDeployDescription.java
@@ -126,7 +126,6 @@ public SubmitJobRequest toSubmitJobRequest(
             .stack(stack)
             .detail(freeFormDetails)
             .entryPoint(entryPoint)
-            .cmd(cmd)
             .iamProfile(iamProfile)
             .capacityGroup(capacityGroup)
             .labels(labels)
@@ -138,6 +137,10 @@ public SubmitJobRequest toSubmitJobRequest(
             .signedAddressAllocations(resources.getSignedAddressAllocations())
             .serviceJobProcesses(serviceJobProcesses);
 
+    if (cmd != null && !cmd.isEmpty()) {
+      submitJobRequest.cmd(cmd);
+    }
+
     if (!securityGroups.isEmpty()) {
       submitJobRequest.securityGroups(securityGroups);
     }