feat(bake): parse version from kork Artifacts (spinnaker#2357)

clanesf · Aug 9, 2018 · b39e74f · b39e74f
1 parent 578e3c6
commit b39e74f
Show file tree

Hide file tree

Showing 4 changed files with 333 additions and 80 deletions.
diff --git a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/CreateBakeTask.groovy b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/CreateBakeTask.groovy
@@ -17,6 +17,7 @@
 package com.netflix.spinnaker.orca.bakery.tasks
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.netflix.spinnaker.kork.artifacts.model.Artifact
 import com.netflix.spinnaker.orca.ExecutionStatus
 import com.netflix.spinnaker.orca.RetryableTask
 import com.netflix.spinnaker.orca.TaskResult
@@ -131,7 +132,10 @@ class CreateBakeTask implements RetryableTask {
       packageType = new OperatingSystem(stage.context.baseOs as String).getPackageType()
     }
 
+    List<Artifact> artifacts = artifactResolver.getAllArtifacts(stage.getExecution())
+
     PackageInfo packageInfo = new PackageInfo(stage,
+      artifacts,
       packageType.packageType,
       packageType.versionDelimiter,
       extractBuildDetails,
@@ -140,6 +144,8 @@ class CreateBakeTask implements RetryableTask {
 
     Map requestMap = packageInfo.findTargetPackage(allowMissingPackageInstallation)
 
+    // if the field "packageArtifactIds" is present in the context, because it was set in the UI,
+    // this will resolve those ids into real artifacts and then put them in List<Artifact> packageArtifacts
     requestMap.packageArtifacts = stage.context.packageArtifactIds.collect { String artifactId ->
       artifactResolver.getBoundArtifactForId(stage, artifactId)
     }

diff --git a/...-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/tasks/CreateBakeTaskSpec.groovy b/...-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/tasks/CreateBakeTaskSpec.groovy
@@ -49,6 +49,10 @@ class CreateBakeTaskSpec extends Specification {
   Stage bakeStage
   def mapper = OrcaObjectMapper.newInstance()
 
+  ArtifactResolver artifactResolver = Stub() {
+    getAllArtifacts(_) >> []
+  }
+
   @Shared
   def runningStatus = new BakeStatus(id: randomUUID(), state: RUNNING)
 
@@ -205,6 +209,7 @@ class CreateBakeTaskSpec extends Specification {
 
   def setup() {
     task.mapper = mapper
+    task.artifactResolver = artifactResolver
     bakeStage = pipeline.stages.first()
   }
 
@@ -349,7 +354,7 @@ class CreateBakeTaskSpec extends Specification {
 
     then:
     IllegalStateException ise = thrown(IllegalStateException)
-    ise.message.startsWith("Found build artifact in Jenkins")
+    ise.message.startsWith("Found build artifact in both Jenkins")
   }
 
   def "outputs the status of the bake"() {
@@ -820,6 +825,7 @@ class CreateBakeTaskSpec extends Specification {
 
     then:
     2 * task.artifactResolver.getBoundArtifactForId(stage, _) >> new Artifact()
+    1 * task.artifactResolver.getAllArtifacts(_) >> []
     bakeResult.getPackageArtifacts().size() == 2
   }
 
@@ -837,6 +843,7 @@ class CreateBakeTaskSpec extends Specification {
 
     then:
     0 * task.artifactResolver.getBoundArtifactForId(*_) >> new Artifact()
+    1 * task.artifactResolver.getAllArtifacts(_) >> []
     bakeResult.getPackageArtifacts().size() == 0
   }
 
@@ -855,6 +862,7 @@ class CreateBakeTaskSpec extends Specification {
     then:
     noExceptionThrown()
     2 * task.artifactResolver.getBoundArtifactForId(stage, _) >> new Artifact()
+    1 * task.artifactResolver.getAllArtifacts(_) >> []
     bakeResult.getPackageArtifacts().size() == 2
   }
 }