Skip to content

Commit c3eb632

Browse files
author
Jared Stehler
committed
fix(pipelineTriggers): change buildNumber type from int to string
in order to support build numbers which are not strict integers (i.e. "123.1")
1 parent fbeb815 commit c3eb632

File tree

37 files changed

+139
-137
lines changed

37 files changed

+139
-137
lines changed

‎orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/tasks/CreateBakeTaskSpec.groovy‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class CreateBakeTaskSpec extends Specification {
156156

157157
@Shared
158158
def buildInfo = new JenkinsBuildInfo(
159-
"name", 0, "http://jenkins", "SUCCESS",
159+
"name", null, "http://jenkins", "SUCCESS",
160160
[
161161
new JenkinsArtifact("hodor_1.1_all.deb", "."),
162162
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -166,7 +166,7 @@ class CreateBakeTaskSpec extends Specification {
166166

167167
@Shared
168168
def buildInfoWithUrl = new JenkinsBuildInfo(
169-
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
169+
"name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
170170
[
171171
new JenkinsArtifact("hodor_1.1_all.deb", "."),
172172
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -176,7 +176,7 @@ class CreateBakeTaskSpec extends Specification {
176176

177177
@Shared
178178
def buildInfoWithFoldersUrl = new JenkinsBuildInfo(
179-
"name", 0, "http://spinnaker.builds.test.netflix.net/job/folder/job/SPINNAKER-package-echo/69/", "SUCCESS",
179+
"name", null, "http://spinnaker.builds.test.netflix.net/job/folder/job/SPINNAKER-package-echo/69/", "SUCCESS",
180180
[
181181
new JenkinsArtifact("hodor_1.1_all.deb", "."),
182182
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -186,7 +186,7 @@ class CreateBakeTaskSpec extends Specification {
186186

187187
@Shared
188188
def buildInfoWithUrlAndSCM = new JenkinsBuildInfo(
189-
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
189+
"name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
190190
[
191191
new JenkinsArtifact("hodor_1.1_all.deb", "."),
192192
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -197,7 +197,7 @@ class CreateBakeTaskSpec extends Specification {
197197

198198
@Shared
199199
def buildInfoWithUrlAndTwoSCMs = new JenkinsBuildInfo(
200-
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
200+
"name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
201201
[
202202
new JenkinsArtifact("hodor_1.1_all.deb", "."),
203203
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -211,7 +211,7 @@ class CreateBakeTaskSpec extends Specification {
211211

212212
@Shared
213213
def buildInfoWithUrlAndMasterAndDevelopSCMs = new JenkinsBuildInfo(
214-
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
214+
"name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
215215
[
216216
new JenkinsArtifact("hodor_1.1_all.deb", "."),
217217
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -225,7 +225,7 @@ class CreateBakeTaskSpec extends Specification {
225225

226226
@Shared
227227
def buildInfoNoMatch = new JenkinsBuildInfo(
228-
"name", 0, "http://jenkins", "SUCCESS",
228+
"name", null, "http://jenkins", "SUCCESS",
229229
[
230230
new JenkinsArtifact("hodornodor_1.1_all.deb", "."),
231231
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -378,7 +378,7 @@ class CreateBakeTaskSpec extends Specification {
378378
given:
379379
bakeConfig.buildInfo = contextInfo
380380
def pipelineWithTrigger = pipeline {
381-
trigger = new JenkinsTrigger("master", "job", 1, null)
381+
trigger = new JenkinsTrigger("master", "job", '1', null)
382382
if (triggerInfo != null) {
383383
trigger.buildInfo = triggerInfo
384384
}
@@ -431,7 +431,7 @@ class CreateBakeTaskSpec extends Specification {
431431
given:
432432
bakeConfig.buildInfo = contextInfo
433433
def pipelineWithTrigger = pipeline {
434-
trigger = new JenkinsTrigger("master", "job", 1, null)
434+
trigger = new JenkinsTrigger("master", "job", '1', null)
435435
if (triggerInfo != null) {
436436
trigger.buildInfo = triggerInfo
437437
}
@@ -482,7 +482,7 @@ class CreateBakeTaskSpec extends Specification {
482482
]
483483
]
484484
def pipelineWithTrigger = pipeline {
485-
trigger = new JenkinsTrigger("master", "job", 1, null)
485+
trigger = new JenkinsTrigger("master", "job", '1', null)
486486
trigger.buildInfo = buildInfo
487487
stage {
488488
type = "bake"
@@ -575,7 +575,7 @@ class CreateBakeTaskSpec extends Specification {
575575
given:
576576
bakeConfig.buildInfo = contextInfo
577577
def pipelineWithTrigger = pipeline {
578-
trigger = new JenkinsTrigger("master", "job", 1, null)
578+
trigger = new JenkinsTrigger("master", "job", '1', null)
579579
if (triggerInfo != null) {
580580
trigger.buildInfo = triggerInfo
581581
}
@@ -626,7 +626,7 @@ class CreateBakeTaskSpec extends Specification {
626626
given:
627627
bakeConfig.buildInfo = contextInfo
628628
def pipelineWithTrigger = pipeline {
629-
trigger = new JenkinsTrigger("master", "job", 1, null)
629+
trigger = new JenkinsTrigger("master", "job", '1', null)
630630
if (triggerInfo != null) {
631631
trigger.buildInfo = triggerInfo
632632
}
@@ -675,7 +675,7 @@ class CreateBakeTaskSpec extends Specification {
675675
given:
676676
bakeConfig.buildInfo = contextInfo
677677
def pipelineWithTrigger = pipeline {
678-
trigger = new JenkinsTrigger("master", "job", 1, null)
678+
trigger = new JenkinsTrigger("master", "job", '1', null)
679679
if (triggerInfo != null) {
680680
trigger.buildInfo = triggerInfo
681681
}
@@ -724,7 +724,7 @@ class CreateBakeTaskSpec extends Specification {
724724
given:
725725
bakeConfig.buildInfo = mapper.convertValue(contextInfo, Map)
726726
def pipelineWithTrigger = pipeline {
727-
trigger = new JenkinsTrigger("master", "job", 1, null)
727+
trigger = new JenkinsTrigger("master", "job", '1', null)
728728
if (triggerInfo != null) {
729729
trigger.buildInfo = triggerInfo
730730
}
@@ -773,7 +773,7 @@ class CreateBakeTaskSpec extends Specification {
773773
given:
774774
bakeConfig.buildInfo = contextInfo
775775
def pipelineWithTrigger = pipeline {
776-
trigger = new JenkinsTrigger("master", "job", 1, null)
776+
trigger = new JenkinsTrigger("master", "job", '1', null)
777777
if (triggerInfo != null) {
778778
trigger.buildInfo = triggerInfo
779779
}
@@ -824,7 +824,7 @@ class CreateBakeTaskSpec extends Specification {
824824
given:
825825
bakeConfig.buildInfo = contextInfo
826826
def pipelineWithTrigger = pipeline {
827-
trigger = new JenkinsTrigger("master", "job", 1, null)
827+
trigger = new JenkinsTrigger("master", "job", '1', null)
828828
if (triggerInfo != null) {
829829
trigger.buildInfo = triggerInfo
830830
}
@@ -878,7 +878,7 @@ class CreateBakeTaskSpec extends Specification {
878878
given:
879879
bakeConfig.buildInfo = contextInfo
880880
def pipelineWithTrigger = pipeline {
881-
trigger = new JenkinsTrigger("master", "job", 1, null)
881+
trigger = new JenkinsTrigger("master", "job", '1', null)
882882
if (triggerInfo != null) {
883883
trigger.buildInfo = triggerInfo
884884
}
@@ -932,7 +932,7 @@ class CreateBakeTaskSpec extends Specification {
932932
given:
933933
bakeConfig.buildInfo = contextInfo
934934
def pipelineWithTrigger = pipeline {
935-
trigger = new JenkinsTrigger("master", "job", 1, null)
935+
trigger = new JenkinsTrigger("master", "job", '1', null)
936936
if (triggerInfo != null) {
937937
trigger.buildInfo = triggerInfo
938938
}
@@ -1282,9 +1282,9 @@ class CreateBakeTaskSpec extends Specification {
12821282

12831283
where:
12841284
triggerConfig | queryParameter
1285-
[type: "jenkins", master: "master", job: "job", buildNumber: 1, rebake: true] | "1"
1286-
[type: "jenkins", master: "master", job: "job", buildNumber: 1, rebake: false] | null
1287-
[type: "jenkins", master: "master", job: "job", buildNumber: 1] | null
1285+
[type: "jenkins", master: "master", job: "job", buildNumber: '1', rebake: true] | "1"
1286+
[type: "jenkins", master: "master", job: "job", buildNumber: '1', rebake: false] | null
1287+
[type: "jenkins", master: "master", job: "job", buildNumber: '1'] | null
12881288
}
12891289

12901290
def "properly resolves package artifacts"() {

‎orca-clouddriver-provider-titus/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/aws/TitusAmazonServerGroupCreatorDecoratorSpec.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import static com.netflix.spinnaker.orca.test.model.ExecutionBuilder.stage
2424
class TitusAmazonServerGroupCreatorDecoratorSpec extends Specification {
2525
def "should find image id from properties file"() {
2626
given:
27-
JenkinsTrigger jenkinsTrigger = new JenkinsTrigger("master", "job", 1, null)
27+
JenkinsTrigger jenkinsTrigger = new JenkinsTrigger("master", "job", "1", null)
2828
jenkinsTrigger.properties.put("imageName", "imageFromProperties")
2929

3030
def pipeline = pipeline {

‎orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/cluster/FindImageFromClusterTaskSpec.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class FindImageFromClusterTaskSpec extends Specification {
8585
imageId : "ami-012",
8686
imageName : "ami-012-name",
8787
image : [imageId: "ami-012", name: "ami-012-name", foo: "bar"],
88-
buildInfo : [job: "foo-build", buildNumber: 1]
88+
buildInfo : [job: "foo-build", buildNumber: '1']
8989
]]
9090
]
9191

@@ -95,7 +95,7 @@ class FindImageFromClusterTaskSpec extends Specification {
9595
imageId : "ami-234",
9696
imageName : "ami-234-name",
9797
image : [imageId: "ami-234", name: "ami-234-name", foo: "baz"],
98-
buildInfo : [job: "foo-build", buildNumber: 1]
98+
buildInfo : [job: "foo-build", buildNumber: '1']
9999
]]
100100
]
101101
}
@@ -135,7 +135,7 @@ class FindImageFromClusterTaskSpec extends Specification {
135135
imageId : "ami-012",
136136
imageName : "ami-012-name",
137137
image : [imageId: "ami-012", name: "ami-012-name", foo: "bar"],
138-
buildInfo : [job: "foo-build", buildNumber: 1]
138+
buildInfo : [job: "foo-build", buildNumber: '1']
139139
]]
140140
]
141141

@@ -239,7 +239,7 @@ class FindImageFromClusterTaskSpec extends Specification {
239239
imageId : "ami-012",
240240
imageName : "ami-012-name-ebs",
241241
image : [imageId: "ami-012", name: "ami-012-name-ebs", foo: "bar"],
242-
buildInfo : [job: "foo-build", buildNumber: 1]
242+
buildInfo : [job: "foo-build", buildNumber: '1']
243243
]]
244244
]
245245

‎orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/appengine/AppEngineBranchFinderSpec.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ class AppEngineBranchFinderSpec extends Specification {
7676
@Unroll
7777
def "(jenkins trigger) should resolve branch, using regex (if provided) to narrow down options"() {
7878
given:
79-
def trigger = new JenkinsTrigger("Jenkins", "poll_git_repo", 1, null)
80-
trigger.buildInfo = new JenkinsBuildInfo("poll_git_repo", 1, "http://jenkins", "SUCCESS", [], scm)
79+
def trigger = new JenkinsTrigger("Jenkins", "poll_git_repo", '1', null)
80+
trigger.buildInfo = new JenkinsBuildInfo("poll_git_repo", '1', "http://jenkins", "SUCCESS", [], scm)
8181

8282
def operation = [
8383
trigger: [
@@ -99,8 +99,8 @@ class AppEngineBranchFinderSpec extends Specification {
9999
@Unroll
100100
def "(jenkins trigger) should throw appropriate error if method cannot resolve exactly one branch"() {
101101
given:
102-
def trigger = new JenkinsTrigger("Jenkins", "poll_git_repo", 1, null)
103-
trigger.buildInfo = new JenkinsBuildInfo("poll_git_repo", 1, "http://jenkins", "SUCCESS", [], scm)
102+
def trigger = new JenkinsTrigger("Jenkins", "poll_git_repo", '1', null)
103+
trigger.buildInfo = new JenkinsBuildInfo("poll_git_repo", '1', "http://jenkins", "SUCCESS", [], scm)
104104

105105
def operation = [
106106
trigger : [

‎orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/utils/OortHelperSpec.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ class OortHelperSpec extends Specification {
3535
"region": "us-west-2",
3636
"asg": { "createdTime": 12344, "suspendedProcesses": [{"processName": "AddToLoadBalancer"}] },
3737
"image": { "imageId": "ami-012", "name": "ami-012" },
38-
"buildInfo": { "job": "foo-build", "buildNumber": 1 },
38+
"buildInfo": { "job": "foo-build", "buildNumber": "1" },
3939
"instances": [ { "id": 1 }, { "id": 2 } ]
4040
},{
4141
"name": "myapp-v003",
4242
"region":"us-west-2",
4343
"asg": { "createdTime": 23456, "suspendedProcesses": [] },
4444
"image": { "imageId": "ami-234", "name": "ami-234" },
45-
"buildInfo": { "job": "foo-build", "buildNumber": 1 },
45+
"buildInfo": { "job": "foo-build", "buildNumber": "1" },
4646
"instances": [ { "id": 1 } ]
4747
}]
4848
}
@@ -67,7 +67,7 @@ class OortHelperSpec extends Specification {
6767
"region": "us-west-2",
6868
"asg": { "createdTime": 12344, "suspendedProcesses": [{"processName": "AddToLoadBalancer"}] },
6969
"image": { "imageId": "ami-012", "name": "ami-012" },
70-
"buildInfo": { "job": "foo-build", "buildNumber": 1 },
70+
"buildInfo": { "job": "foo-build", "buildNumber": "1" },
7171
"instances": [ { "instanceId": 1, "health" : [{"healthCheckUrl" : "http://foo/bar"}, {"status": "UP"}] }, { "instanceId": 2, "health" : [{"healthCheckUrl" : "http://foo2/bar2"}, {"status": "UP"}] } ]
7272
}]
7373
}
@@ -92,7 +92,7 @@ class OortHelperSpec extends Specification {
9292
"region": "us-west-2",
9393
"asg": { "createdTime": 12344, "suspendedProcesses": [{"processName": "AddToLoadBalancer"}] },
9494
"image": { "imageId": "ami-012", "name": "ami-012" },
95-
"buildInfo": { "job": "foo-build", "buildNumber": 1 },
95+
"buildInfo": { "job": "foo-build", "buildNumber": "1" },
9696
"instances": [ { "instanceId": 1, "health" : [{"healthCheckUrl" : "http://foo/bar"}, {"status": "DOWN"}] },
9797
{ "instanceId": 2, "health" : [{"healthCheckUrl" : "http://foo2/bar2"}, {"status": "UP"}] },
9898
{ "instanceId": 3, "health" : [{"healthCheckUrl" : "http://foo2/bar3"}] },

‎orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/kato/pipeline/ParallelDeployStageSpec.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ParallelDeployStageSpec extends Specification {
3030
def "should build contexts corresponding to cluster configuration(s)"() {
3131
given:
3232
def pipeline = pipeline {
33-
trigger = new JenkinsTrigger("master", "job", 1, null)
33+
trigger = new JenkinsTrigger("master", "job", "1", null)
3434
application = "orca"
3535
}
3636
def bakeStage = new StageExecutionImpl(pipeline, "deploy", "Deploy!", stageContext)
@@ -57,7 +57,7 @@ class ParallelDeployStageSpec extends Specification {
5757
def "pipeline strategy should #data.scenario"() {
5858
given:
5959
def parentPipeline = pipeline {
60-
trigger = new JenkinsTrigger("master", "job", 1, null)
60+
trigger = new JenkinsTrigger("master", "job", "1", null)
6161
application = "orca"
6262
stage {
6363
name = "parent stage"

‎orca-clouddriver/src/test/resources/pipelinetrigger.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11072,12 +11072,12 @@
1107211072
"master": "mimir",
1107311073
"job": "SPIN-TASKS",
1107411074
"queuedBuild": "173601",
11075-
"buildNumber": 206809,
11075+
"buildNumber": "206809",
1107611076
"buildInfo": {
1107711077
"building": false,
1107811078
"fullDisplayName": "SPIN-TASKS #206809",
1107911079
"name": "SPIN-TASKS",
11080-
"number": 206809,
11080+
"number": "206809",
1108111081
"duration": 13190,
1108211082
"timestamp": "1510187419430",
1108311083
"result": "SUCCESS",
@@ -11109,7 +11109,7 @@
1110911109
"building": false,
1111011110
"fullDisplayName": "SPIN-TASKS #206809",
1111111111
"name": "SPIN-TASKS",
11112-
"number": 206809,
11112+
"number": "206809",
1111311113
"duration": 13190,
1111411114
"timestamp": "1510187419430",
1111511115
"result": "SUCCESS",

‎orca-core-tck/src/main/groovy/com/netflix/spinnaker/orca/pipeline/persistence/PipelineExecutionRepositoryTck.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ abstract class PipelineExecutionRepositoryTck<T extends ExecutionRepository> ext
223223
def pipeline = pipeline {
224224
application = "orca"
225225
name = "dummy-pipeline"
226-
trigger = new JenkinsTrigger("master", "job", 1, null)
226+
trigger = new JenkinsTrigger("master", "job", '1', null)
227227
stage {
228228
type = "one"
229229
context = [foo: "foo"]

‎orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/BuildInfo.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.netflix.spinnaker.orca.pipeline.model
22

33
abstract class BuildInfo<A>(
44
open val name: String?,
5-
open val number: Int,
5+
open val number: String?,
66
open val url: String?,
77
open val result: String?,
88
open val artifacts: List<A>? = emptyList(),

‎orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/ConcourseTrigger.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class ConcourseBuildInfo
9090
@JsonCreator
9191
constructor(
9292
@param:JsonProperty("name") override val name: String?,
93-
@param:JsonProperty("number") override val number: Int,
93+
@param:JsonProperty("number") override val number: String?,
9494
@param:JsonProperty("url") override val url: String?,
9595
@param:JsonProperty("result") override val result: String?,
9696
@param:JsonProperty("artifacts") override val artifacts: List<JenkinsArtifact>?,

0 commit comments

Comments
 (0)