fix(cf): capture build info for a manual trigger (#3773)

The Jenkins buildInfo is also populated on a manual trigger of a pipeline with a Jenkins trigger. We should use it.
spinnaker · Jun 12, 2019 · dc3b881 · dc3b881
1 parent d901202
commit dc3b881
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...ker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServerGroupAtomicOperation.java b/...ker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServerGroupAtomicOperation.java
@@ -263,8 +263,12 @@ private static ExternalReference resolveBuildInfo(
       final Map<String, Object> trigger = description.getTrigger();
       if (trigger != null) {
         final String triggerType = (String) trigger.get("type");
-        if (triggerType.equals("jenkins")) {
-          buildInfo = (Map<String, Object>) trigger.get("buildInfo");
+        if (triggerType.equals("jenkins") || triggerType.equals("manual")) {
+          final Map<String, Object> triggerBuildInfo =
+              (Map<String, Object>) trigger.get("buildInfo");
+          if (triggerBuildInfo != null) {
+            buildInfo = triggerBuildInfo;
+          }
         }
       }
     }