Skip to content

Commit d747883

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 5881377 commit d747883

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
@@ -118,7 +118,7 @@ class CreateBakeTaskSpec extends Specification {
118118

119119
@Shared
120120
def buildInfo = new JenkinsBuildInfo(
121-
"name", 0, "http://jenkins", "SUCCESS",
121+
"name", null, "http://jenkins", "SUCCESS",
122122
[
123123
new JenkinsArtifact("hodor_1.1_all.deb", "."),
124124
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -128,7 +128,7 @@ class CreateBakeTaskSpec extends Specification {
128128

129129
@Shared
130130
def buildInfoWithUrl = new JenkinsBuildInfo(
131-
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
131+
"name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
132132
[
133133
new JenkinsArtifact("hodor_1.1_all.deb", "."),
134134
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -138,7 +138,7 @@ class CreateBakeTaskSpec extends Specification {
138138

139139
@Shared
140140
def buildInfoWithFoldersUrl = new JenkinsBuildInfo(
141-
"name", 0, "http://spinnaker.builds.test.netflix.net/job/folder/job/SPINNAKER-package-echo/69/", "SUCCESS",
141+
"name", null, "http://spinnaker.builds.test.netflix.net/job/folder/job/SPINNAKER-package-echo/69/", "SUCCESS",
142142
[
143143
new JenkinsArtifact("hodor_1.1_all.deb", "."),
144144
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -148,7 +148,7 @@ class CreateBakeTaskSpec extends Specification {
148148

149149
@Shared
150150
def buildInfoWithUrlAndSCM = new JenkinsBuildInfo(
151-
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
151+
"name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
152152
[
153153
new JenkinsArtifact("hodor_1.1_all.deb", "."),
154154
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -159,7 +159,7 @@ class CreateBakeTaskSpec extends Specification {
159159

160160
@Shared
161161
def buildInfoWithUrlAndTwoSCMs = new JenkinsBuildInfo(
162-
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
162+
"name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
163163
[
164164
new JenkinsArtifact("hodor_1.1_all.deb", "."),
165165
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -173,7 +173,7 @@ class CreateBakeTaskSpec extends Specification {
173173

174174
@Shared
175175
def buildInfoWithUrlAndMasterAndDevelopSCMs = new JenkinsBuildInfo(
176-
"name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
176+
"name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
177177
[
178178
new JenkinsArtifact("hodor_1.1_all.deb", "."),
179179
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -187,7 +187,7 @@ class CreateBakeTaskSpec extends Specification {
187187

188188
@Shared
189189
def buildInfoNoMatch = new JenkinsBuildInfo(
190-
"name", 0, "http://jenkins", "SUCCESS",
190+
"name", null, "http://jenkins", "SUCCESS",
191191
[
192192
new JenkinsArtifact("hodornodor_1.1_all.deb", "."),
193193
new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -340,7 +340,7 @@ class CreateBakeTaskSpec extends Specification {
340340
given:
341341
bakeConfig.buildInfo = contextInfo
342342
def pipelineWithTrigger = pipeline {
343-
trigger = new JenkinsTrigger("master", "job", 1, null)
343+
trigger = new JenkinsTrigger("master", "job", '1', null)
344344
if (triggerInfo != null) {
345345
trigger.buildInfo = triggerInfo
346346
}
@@ -393,7 +393,7 @@ class CreateBakeTaskSpec extends Specification {
393393
given:
394394
bakeConfig.buildInfo = contextInfo
395395
def pipelineWithTrigger = pipeline {
396-
trigger = new JenkinsTrigger("master", "job", 1, null)
396+
trigger = new JenkinsTrigger("master", "job", '1', null)
397397
if (triggerInfo != null) {
398398
trigger.buildInfo = triggerInfo
399399
}
@@ -444,7 +444,7 @@ class CreateBakeTaskSpec extends Specification {
444444
]
445445
]
446446
def pipelineWithTrigger = pipeline {
447-
trigger = new JenkinsTrigger("master", "job", 1, null)
447+
trigger = new JenkinsTrigger("master", "job", '1', null)
448448
trigger.buildInfo = buildInfo
449449
stage {
450450
type = "bake"
@@ -537,7 +537,7 @@ class CreateBakeTaskSpec extends Specification {
537537
given:
538538
bakeConfig.buildInfo = contextInfo
539539
def pipelineWithTrigger = pipeline {
540-
trigger = new JenkinsTrigger("master", "job", 1, null)
540+
trigger = new JenkinsTrigger("master", "job", '1', null)
541541
if (triggerInfo != null) {
542542
trigger.buildInfo = triggerInfo
543543
}
@@ -588,7 +588,7 @@ class CreateBakeTaskSpec extends Specification {
588588
given:
589589
bakeConfig.buildInfo = contextInfo
590590
def pipelineWithTrigger = pipeline {
591-
trigger = new JenkinsTrigger("master", "job", 1, null)
591+
trigger = new JenkinsTrigger("master", "job", '1', null)
592592
if (triggerInfo != null) {
593593
trigger.buildInfo = triggerInfo
594594
}
@@ -637,7 +637,7 @@ class CreateBakeTaskSpec extends Specification {
637637
given:
638638
bakeConfig.buildInfo = contextInfo
639639
def pipelineWithTrigger = pipeline {
640-
trigger = new JenkinsTrigger("master", "job", 1, null)
640+
trigger = new JenkinsTrigger("master", "job", '1', null)
641641
if (triggerInfo != null) {
642642
trigger.buildInfo = triggerInfo
643643
}
@@ -686,7 +686,7 @@ class CreateBakeTaskSpec extends Specification {
686686
given:
687687
bakeConfig.buildInfo = mapper.convertValue(contextInfo, Map)
688688
def pipelineWithTrigger = pipeline {
689-
trigger = new JenkinsTrigger("master", "job", 1, null)
689+
trigger = new JenkinsTrigger("master", "job", '1', null)
690690
if (triggerInfo != null) {
691691
trigger.buildInfo = triggerInfo
692692
}
@@ -735,7 +735,7 @@ class CreateBakeTaskSpec extends Specification {
735735
given:
736736
bakeConfig.buildInfo = contextInfo
737737
def pipelineWithTrigger = pipeline {
738-
trigger = new JenkinsTrigger("master", "job", 1, null)
738+
trigger = new JenkinsTrigger("master", "job", '1', null)
739739
if (triggerInfo != null) {
740740
trigger.buildInfo = triggerInfo
741741
}
@@ -786,7 +786,7 @@ class CreateBakeTaskSpec extends Specification {
786786
given:
787787
bakeConfig.buildInfo = contextInfo
788788
def pipelineWithTrigger = pipeline {
789-
trigger = new JenkinsTrigger("master", "job", 1, null)
789+
trigger = new JenkinsTrigger("master", "job", '1', null)
790790
if (triggerInfo != null) {
791791
trigger.buildInfo = triggerInfo
792792
}
@@ -840,7 +840,7 @@ class CreateBakeTaskSpec extends Specification {
840840
given:
841841
bakeConfig.buildInfo = contextInfo
842842
def pipelineWithTrigger = pipeline {
843-
trigger = new JenkinsTrigger("master", "job", 1, null)
843+
trigger = new JenkinsTrigger("master", "job", '1', null)
844844
if (triggerInfo != null) {
845845
trigger.buildInfo = triggerInfo
846846
}
@@ -894,7 +894,7 @@ class CreateBakeTaskSpec extends Specification {
894894
given:
895895
bakeConfig.buildInfo = contextInfo
896896
def pipelineWithTrigger = pipeline {
897-
trigger = new JenkinsTrigger("master", "job", 1, null)
897+
trigger = new JenkinsTrigger("master", "job", '1', null)
898898
if (triggerInfo != null) {
899899
trigger.buildInfo = triggerInfo
900900
}
@@ -1111,9 +1111,9 @@ class CreateBakeTaskSpec extends Specification {
11111111

11121112
where:
11131113
triggerConfig | queryParameter
1114-
[type: "jenkins", master: "master", job: "job", buildNumber: 1, rebake: true] | "1"
1115-
[type: "jenkins", master: "master", job: "job", buildNumber: 1, rebake: false] | null
1116-
[type: "jenkins", master: "master", job: "job", buildNumber: 1] | null
1114+
[type: "jenkins", master: "master", job: "job", buildNumber: '1', rebake: true] | "1"
1115+
[type: "jenkins", master: "master", job: "job", buildNumber: '1', rebake: false] | null
1116+
[type: "jenkins", master: "master", job: "job", buildNumber: '1'] | null
11171117
}
11181118

11191119
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)