fix(artifacts): don't output buildArtifacts as korkArtifacts (#3417)

spinnaker · Feb 7, 2020 · df36cfe · df36cfe
1 parent 6970247
commit df36cfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/tasks/GetBuildArtifactsTask.java b/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/tasks/GetBuildArtifactsTask.java
@@ -22,7 +22,6 @@
 import com.netflix.spinnaker.orca.igor.BuildService;
 import com.netflix.spinnaker.orca.igor.model.CIStageDefinition;
 import com.netflix.spinnaker.orca.pipeline.model.Stage;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -45,10 +44,6 @@ public class GetBuildArtifactsTask extends RetryableIgorTask<CIStageDefinition>
             stageDefinition.getPropertyFile(),
             stageDefinition.getMaster(),
             stageDefinition.getJob());
-    if (artifacts == null) {
-      artifacts = new ArrayList<>();
-    }
-    artifacts.addAll(stageDefinition.getBuildInfo().getArtifacts());
     Map<String, List<Artifact>> outputs = Collections.singletonMap("artifacts", artifacts);
     return TaskResult.builder(ExecutionStatus.SUCCEEDED)
         .context(Collections.emptyMap())

diff --git a/...or/src/test/groovy/com/netflix/spinnaker/orca/igor/tasks/GetBuildArtifactsTaskSpec.groovy b/...or/src/test/groovy/com/netflix/spinnaker/orca/igor/tasks/GetBuildArtifactsTaskSpec.groovy
@@ -114,8 +114,9 @@ class GetBuildArtifactsTaskSpec extends Specification {
 
     then:
     1 * buildService.getArtifacts(BUILD_NUMBER, null, MASTER, JOB)  >> [testArtifact]
-    artifacts.size() == 2
-    artifacts*.name == ["my-artifact", "another-artifact"]
+    // Modified to reflect a fix to avoid mixing build and kork artifacts in outputs.artifacts.
+    artifacts.size() == 1
+    artifacts*.name == ["my-artifact"]
   }
 
   def createStage(String propertyFile) {