Skip to content

Commit

Permalink
fix(concourse): Fix concourse build info type (#2779) (#2781)
Browse files Browse the repository at this point in the history
  • Loading branch information
spinnakerbot authored and jkschneider committed Mar 22, 2019
1 parent bb8161b commit c89dc19
Showing 1 changed file with 14 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package com.netflix.spinnaker.orca.pipeline.model

import com.fasterxml.jackson.annotation.JsonCreator
import com.fasterxml.jackson.annotation.JsonProperty
import com.netflix.spinnaker.kork.artifacts.model.Artifact
import com.netflix.spinnaker.kork.artifacts.model.ExpectedArtifact

Expand All @@ -33,6 +35,17 @@ data class ConcourseTrigger
) : Trigger {
override var other: Map<String, Any> = mutableMapOf()
override var resolvedExpectedArtifacts: List<ExpectedArtifact> = mutableListOf()
var buildInfo: BuildInfo<Any>? = null
var buildInfo: ConcourseBuildInfo? = null
var properties: Map<String, Any> = mutableMapOf()
}

class ConcourseBuildInfo
@JsonCreator
constructor(@param:JsonProperty("name") override val name: String?,
@param:JsonProperty("number") override val number: Int,
@param:JsonProperty("url") override val url: String?,
@param:JsonProperty("result") override val result: String?,
@param:JsonProperty("artifacts") override val artifacts: List<JenkinsArtifact>?,
@param:JsonProperty("scm") override val scm: List<SourceControl>?,
@param:JsonProperty("building") override var building: Boolean = false)
: BuildInfo<Any>(name, number, url, result, artifacts, scm, building)

0 comments on commit c89dc19

Please sign in to comment.