fix(quip): fix for quip version not correctly propagating

spinnaker · Mar 30, 2017 · 177bb11 · 177bb11
1 parent 8ebf044
commit 177bb11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.../src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/quip/ResolveQuipVersionTask.groovy b/.../src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/quip/ResolveQuipVersionTask.groovy
@@ -71,6 +71,6 @@ class ResolveQuipVersionTask implements RetryableTask {
       objectMapper)
     String version = stage.context?.patchVersion ?:  packageInfo.findTargetPackage(allowMissingPackageInstallation)?.packageVersion
 
-    return new TaskResult(ExecutionStatus.SUCCEEDED, [version: version])
+    return new TaskResult(ExecutionStatus.SUCCEEDED, [version: version], [version:version])
   }
 }
diff --git a/...ddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/quip/TriggerQuipTask.groovy b/...ddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/tasks/quip/TriggerQuipTask.groovy
@@ -54,8 +54,8 @@ class TriggerQuipTask extends AbstractQuipTask implements RetryableTask {
     String packageName = stage.context?.package
     String version = stage.ancestors { Stage ancestorStage, StageDefinitionBuilder ancestorStageBuilder ->
       ancestorStage.id == stage.parentStageId
-    }.getAt(0)?.stage?.context?.version
-    Map<String, Map> skippedInstances = stage.context.skippedInstances ?: [:]
+    }.getAt(0)?.stage?.context?.version ?: stage.context.version
+   Map<String, Map> skippedInstances = stage.context.skippedInstances ?: [:]
     Set<String> patchedInstanceIds = []
     // verify instance list, package, and version are in the context
     if (version && packageName && remainingInstances) {