From dc3b881f9c03c67045cc0aca3b6b1078d4169877 Mon Sep 17 00:00:00 2001
From: Clay McCoy <github@claymccoy.com>
Date: Wed, 12 Jun 2019 08:39:06 -0500
Subject: [PATCH] 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.
---
 .../ops/DeployCloudFoundryServerGroupAtomicOperation.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServerGroupAtomicOperation.java b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServerGroupAtomicOperation.java
index 7b2c8679367..433aaad4f6e 100644
--- a/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServerGroupAtomicOperation.java
+++ b/clouddriver-cloudfoundry/src/main/java/com/netflix/spinnaker/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;
+          }
         }
       }
     }