fix(pipelineTriggers): change buildNumber type from int to string

in order to support build numbers which are not strict integers (i.e. "123.1")
spinnaker · Nov 9, 2022 · 90975c0 · 90975c0
1 parent 6fddc77
commit 90975c0
Show file tree

Hide file tree

Showing 37 changed files with 139 additions and 137 deletions.
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
@@ -118,7 +118,7 @@ class CreateBakeTaskSpec extends Specification {
 
   @Shared
   def buildInfo = new JenkinsBuildInfo(
-    "name", 0, "http://jenkins", "SUCCESS",
+    "name", null, "http://jenkins", "SUCCESS",
     [
       new JenkinsArtifact("hodor_1.1_all.deb", "."),
       new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -128,7 +128,7 @@ class CreateBakeTaskSpec extends Specification {
 
   @Shared
   def buildInfoWithUrl = new JenkinsBuildInfo(
-    "name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
+    "name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
     [
       new JenkinsArtifact("hodor_1.1_all.deb", "."),
       new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -138,7 +138,7 @@ class CreateBakeTaskSpec extends Specification {
 
   @Shared
   def buildInfoWithFoldersUrl = new JenkinsBuildInfo(
-    "name", 0, "http://spinnaker.builds.test.netflix.net/job/folder/job/SPINNAKER-package-echo/69/", "SUCCESS",
+    "name", null, "http://spinnaker.builds.test.netflix.net/job/folder/job/SPINNAKER-package-echo/69/", "SUCCESS",
     [
       new JenkinsArtifact("hodor_1.1_all.deb", "."),
       new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -148,7 +148,7 @@ class CreateBakeTaskSpec extends Specification {
 
   @Shared
   def buildInfoWithUrlAndSCM = new JenkinsBuildInfo(
-    "name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
+    "name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
     [
       new JenkinsArtifact("hodor_1.1_all.deb", "."),
       new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -159,7 +159,7 @@ class CreateBakeTaskSpec extends Specification {
 
   @Shared
   def buildInfoWithUrlAndTwoSCMs = new JenkinsBuildInfo(
-    "name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
+    "name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
     [
       new JenkinsArtifact("hodor_1.1_all.deb", "."),
       new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -173,7 +173,7 @@ class CreateBakeTaskSpec extends Specification {
 
   @Shared
   def buildInfoWithUrlAndMasterAndDevelopSCMs = new JenkinsBuildInfo(
-    "name", 0, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
+    "name", null, "http://spinnaker.builds.test.netflix.net/job/SPINNAKER-package-echo/69/", "SUCCESS",
     [
       new JenkinsArtifact("hodor_1.1_all.deb", "."),
       new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -187,7 +187,7 @@ class CreateBakeTaskSpec extends Specification {
 
   @Shared
   def buildInfoNoMatch = new JenkinsBuildInfo(
-    "name", 0, "http://jenkins", "SUCCESS",
+    "name", null, "http://jenkins", "SUCCESS",
     [
       new JenkinsArtifact("hodornodor_1.1_all.deb", "."),
       new JenkinsArtifact("hodor-1.1.noarch.rpm", "."),
@@ -340,7 +340,7 @@ class CreateBakeTaskSpec extends Specification {
     given:
     bakeConfig.buildInfo = contextInfo
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       if (triggerInfo != null) {
         trigger.buildInfo = triggerInfo
       }
@@ -393,7 +393,7 @@ class CreateBakeTaskSpec extends Specification {
     given:
     bakeConfig.buildInfo = contextInfo
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       if (triggerInfo != null) {
         trigger.buildInfo = triggerInfo
       }
@@ -444,7 +444,7 @@ class CreateBakeTaskSpec extends Specification {
       ]
     ]
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       trigger.buildInfo = buildInfo
       stage {
         type = "bake"
@@ -537,7 +537,7 @@ class CreateBakeTaskSpec extends Specification {
     given:
     bakeConfig.buildInfo = contextInfo
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       if (triggerInfo != null) {
         trigger.buildInfo = triggerInfo
       }
@@ -588,7 +588,7 @@ class CreateBakeTaskSpec extends Specification {
     given:
     bakeConfig.buildInfo = contextInfo
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       if (triggerInfo != null) {
         trigger.buildInfo = triggerInfo
       }
@@ -637,7 +637,7 @@ class CreateBakeTaskSpec extends Specification {
     given:
     bakeConfig.buildInfo = contextInfo
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       if (triggerInfo != null) {
         trigger.buildInfo = triggerInfo
       }
@@ -686,7 +686,7 @@ class CreateBakeTaskSpec extends Specification {
     given:
     bakeConfig.buildInfo = mapper.convertValue(contextInfo, Map)
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       if (triggerInfo != null) {
         trigger.buildInfo = triggerInfo
       }
@@ -735,7 +735,7 @@ class CreateBakeTaskSpec extends Specification {
     given:
     bakeConfig.buildInfo = contextInfo
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       if (triggerInfo != null) {
         trigger.buildInfo = triggerInfo
       }
@@ -786,7 +786,7 @@ class CreateBakeTaskSpec extends Specification {
     given:
     bakeConfig.buildInfo = contextInfo
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       if (triggerInfo != null) {
         trigger.buildInfo = triggerInfo
       }
@@ -840,7 +840,7 @@ class CreateBakeTaskSpec extends Specification {
     given:
     bakeConfig.buildInfo = contextInfo
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       if (triggerInfo != null) {
         trigger.buildInfo = triggerInfo
       }
@@ -894,7 +894,7 @@ class CreateBakeTaskSpec extends Specification {
     given:
     bakeConfig.buildInfo = contextInfo
     def pipelineWithTrigger = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       if (triggerInfo != null) {
         trigger.buildInfo = triggerInfo
       }
@@ -1111,9 +1111,9 @@ class CreateBakeTaskSpec extends Specification {
 
     where:
     triggerConfig                                                 | queryParameter
-    [type: "jenkins", master: "master", job: "job", buildNumber: 1, rebake: true]  | "1"
-    [type: "jenkins", master: "master", job: "job", buildNumber: 1, rebake: false] | null
-    [type: "jenkins", master: "master", job: "job", buildNumber: 1]                | null
+    [type: "jenkins", master: "master", job: "job", buildNumber: '1', rebake: true]  | "1"
+    [type: "jenkins", master: "master", job: "job", buildNumber: '1', rebake: false] | null
+    [type: "jenkins", master: "master", job: "job", buildNumber: '1']                | null
   }
 
   def "properly resolves package artifacts"() {

diff --git a/...er/orca/clouddriver/tasks/providers/aws/TitusAmazonServerGroupCreatorDecoratorSpec.groovy b/...er/orca/clouddriver/tasks/providers/aws/TitusAmazonServerGroupCreatorDecoratorSpec.groovy
@@ -24,7 +24,7 @@ import static com.netflix.spinnaker.orca.test.model.ExecutionBuilder.stage
 class TitusAmazonServerGroupCreatorDecoratorSpec extends Specification {
   def "should find image id from properties file"() {
     given:
-    JenkinsTrigger jenkinsTrigger = new JenkinsTrigger("master", "job", 1, null)
+    JenkinsTrigger jenkinsTrigger = new JenkinsTrigger("master", "job", "1", null)
     jenkinsTrigger.properties.put("imageName", "imageFromProperties")
 
     def pipeline = pipeline {

diff --git a/.../com/netflix/spinnaker/orca/clouddriver/tasks/cluster/FindImageFromClusterTaskSpec.groovy b/.../com/netflix/spinnaker/orca/clouddriver/tasks/cluster/FindImageFromClusterTaskSpec.groovy
@@ -85,7 +85,7 @@ class FindImageFromClusterTaskSpec extends Specification {
                     imageId        : "ami-012",
                     imageName      : "ami-012-name",
                     image          : [imageId: "ami-012", name: "ami-012-name", foo: "bar"],
-                    buildInfo      : [job: "foo-build", buildNumber: 1]
+                    buildInfo      : [job: "foo-build", buildNumber: '1']
                   ]]
     ]
 
@@ -95,7 +95,7 @@ class FindImageFromClusterTaskSpec extends Specification {
                     imageId        : "ami-234",
                     imageName      : "ami-234-name",
                     image          : [imageId: "ami-234", name: "ami-234-name", foo: "baz"],
-                    buildInfo      : [job: "foo-build", buildNumber: 1]
+                    buildInfo      : [job: "foo-build", buildNumber: '1']
                   ]]
     ]
   }
@@ -135,7 +135,7 @@ class FindImageFromClusterTaskSpec extends Specification {
                     imageId        : "ami-012",
                     imageName      : "ami-012-name",
                     image          : [imageId: "ami-012", name: "ami-012-name", foo: "bar"],
-                    buildInfo      : [job: "foo-build", buildNumber: 1]
+                    buildInfo      : [job: "foo-build", buildNumber: '1']
                   ]]
     ]
 
@@ -239,7 +239,7 @@ class FindImageFromClusterTaskSpec extends Specification {
                     imageId        : "ami-012",
                     imageName      : "ami-012-name-ebs",
                     image          : [imageId: "ami-012", name: "ami-012-name-ebs", foo: "bar"],
-                    buildInfo      : [job: "foo-build", buildNumber: 1]
+                    buildInfo      : [job: "foo-build", buildNumber: '1']
                   ]]
     ]
 

diff --git a/...lix/spinnaker/orca/clouddriver/tasks/providers/appengine/AppEngineBranchFinderSpec.groovy b/...lix/spinnaker/orca/clouddriver/tasks/providers/appengine/AppEngineBranchFinderSpec.groovy
@@ -76,8 +76,8 @@ class AppEngineBranchFinderSpec extends Specification {
   @Unroll
   def "(jenkins trigger) should resolve branch, using regex (if provided) to narrow down options"() {
     given:
-    def trigger = new JenkinsTrigger("Jenkins", "poll_git_repo", 1, null)
-    trigger.buildInfo = new JenkinsBuildInfo("poll_git_repo", 1, "http://jenkins", "SUCCESS", [], scm)
+    def trigger = new JenkinsTrigger("Jenkins", "poll_git_repo", '1', null)
+    trigger.buildInfo = new JenkinsBuildInfo("poll_git_repo", '1', "http://jenkins", "SUCCESS", [], scm)
 
     def operation = [
       trigger: [
@@ -99,8 +99,8 @@ class AppEngineBranchFinderSpec extends Specification {
   @Unroll
   def "(jenkins trigger) should throw appropriate error if method cannot resolve exactly one branch"() {
     given:
-    def trigger = new JenkinsTrigger("Jenkins", "poll_git_repo", 1, null)
-    trigger.buildInfo = new JenkinsBuildInfo("poll_git_repo", 1, "http://jenkins", "SUCCESS", [], scm)
+    def trigger = new JenkinsTrigger("Jenkins", "poll_git_repo", '1', null)
+    trigger.buildInfo = new JenkinsBuildInfo("poll_git_repo", '1', "http://jenkins", "SUCCESS", [], scm)
 
     def operation = [
       trigger      : [

diff --git a/...driver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/utils/OortHelperSpec.groovy b/...driver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/utils/OortHelperSpec.groovy
@@ -35,14 +35,14 @@ class OortHelperSpec extends Specification {
         "region": "us-west-2",
         "asg": { "createdTime": 12344, "suspendedProcesses": [{"processName": "AddToLoadBalancer"}] },
         "image": { "imageId": "ami-012", "name": "ami-012" },
-        "buildInfo": { "job": "foo-build", "buildNumber": 1 },
+        "buildInfo": { "job": "foo-build", "buildNumber": "1" },
         "instances": [ { "id": 1 }, { "id": 2 } ]
       },{
         "name": "myapp-v003",
         "region":"us-west-2",
         "asg": { "createdTime": 23456,  "suspendedProcesses": [] },
         "image": { "imageId": "ami-234", "name": "ami-234" },
-        "buildInfo": { "job": "foo-build", "buildNumber": 1 },
+        "buildInfo": { "job": "foo-build", "buildNumber": "1" },
         "instances": [ { "id": 1 } ]
       }]
     }
@@ -67,7 +67,7 @@ class OortHelperSpec extends Specification {
         "region": "us-west-2",
         "asg": { "createdTime": 12344, "suspendedProcesses": [{"processName": "AddToLoadBalancer"}] },
         "image": { "imageId": "ami-012", "name": "ami-012" },
-        "buildInfo": { "job": "foo-build", "buildNumber": 1 },
+        "buildInfo": { "job": "foo-build", "buildNumber": "1" },
         "instances": [ { "instanceId": 1, "health" : [{"healthCheckUrl" : "http://foo/bar"}, {"status": "UP"}] }, { "instanceId": 2, "health" : [{"healthCheckUrl" : "http://foo2/bar2"}, {"status": "UP"}] } ]
       }]
     }
@@ -92,7 +92,7 @@ class OortHelperSpec extends Specification {
         "region": "us-west-2",
         "asg": { "createdTime": 12344, "suspendedProcesses": [{"processName": "AddToLoadBalancer"}] },
         "image": { "imageId": "ami-012", "name": "ami-012" },
-        "buildInfo": { "job": "foo-build", "buildNumber": 1 },
+        "buildInfo": { "job": "foo-build", "buildNumber": "1" },
         "instances": [ { "instanceId": 1, "health" : [{"healthCheckUrl" : "http://foo/bar"}, {"status": "DOWN"}] },
                        { "instanceId": 2, "health" : [{"healthCheckUrl" : "http://foo2/bar2"}, {"status": "UP"}] },
                        { "instanceId": 3, "health" : [{"healthCheckUrl" : "http://foo2/bar3"}] },

diff --git a/...r/src/test/groovy/com/netflix/spinnaker/orca/kato/pipeline/ParallelDeployStageSpec.groovy b/...r/src/test/groovy/com/netflix/spinnaker/orca/kato/pipeline/ParallelDeployStageSpec.groovy
@@ -30,7 +30,7 @@ class ParallelDeployStageSpec extends Specification {
   def "should build contexts corresponding to cluster configuration(s)"() {
     given:
     def pipeline = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", "1", null)
       application = "orca"
     }
     def bakeStage = new StageExecutionImpl(pipeline, "deploy", "Deploy!", stageContext)
@@ -57,7 +57,7 @@ class ParallelDeployStageSpec extends Specification {
   def "pipeline strategy should #data.scenario"() {
     given:
     def parentPipeline = pipeline {
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", "1", null)
       application = "orca"
       stage {
         name = "parent stage"

diff --git a/orca-clouddriver/src/test/resources/pipelinetrigger.json b/orca-clouddriver/src/test/resources/pipelinetrigger.json
@@ -11072,12 +11072,12 @@
                 "master": "mimir",
                 "job": "SPIN-TASKS",
                 "queuedBuild": "173601",
-                "buildNumber": 206809,
+                "buildNumber": "206809",
                 "buildInfo": {
                   "building": false,
                   "fullDisplayName": "SPIN-TASKS #206809",
                   "name": "SPIN-TASKS",
-                  "number": 206809,
+                  "number": "206809",
                   "duration": 13190,
                   "timestamp": "1510187419430",
                   "result": "SUCCESS",
@@ -11109,7 +11109,7 @@
                   "building": false,
                   "fullDisplayName": "SPIN-TASKS #206809",
                   "name": "SPIN-TASKS",
-                  "number": 206809,
+                  "number": "206809",
                   "duration": 13190,
                   "timestamp": "1510187419430",
                   "result": "SUCCESS",

diff --git a/...ovy/com/netflix/spinnaker/orca/pipeline/persistence/PipelineExecutionRepositoryTck.groovy b/...ovy/com/netflix/spinnaker/orca/pipeline/persistence/PipelineExecutionRepositoryTck.groovy
@@ -223,7 +223,7 @@ abstract class PipelineExecutionRepositoryTck<T extends ExecutionRepository> ext
     def pipeline = pipeline {
       application = "orca"
       name = "dummy-pipeline"
-      trigger = new JenkinsTrigger("master", "job", 1, null)
+      trigger = new JenkinsTrigger("master", "job", '1', null)
       stage {
         type = "one"
         context = [foo: "foo"]

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/BuildInfo.kt b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/BuildInfo.kt
@@ -2,7 +2,7 @@ package com.netflix.spinnaker.orca.pipeline.model
 
 abstract class BuildInfo<A>(
   open val name: String?,
-  open val number: Int,
+  open val number: String?,
   open val url: String?,
   open val result: String?,
   open val artifacts: List<A>? = emptyList(),

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/ConcourseTrigger.kt b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/ConcourseTrigger.kt
@@ -90,7 +90,7 @@ class ConcourseBuildInfo
 @JsonCreator
 constructor(
   @param:JsonProperty("name") override val name: String?,
-  @param:JsonProperty("number") override val number: Int,
+  @param:JsonProperty("number") override val number: String?,
   @param:JsonProperty("url") override val url: String?,
   @param:JsonProperty("result") override val result: String?,
   @param:JsonProperty("artifacts") override val artifacts: List<JenkinsArtifact>?,

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/JenkinsTrigger.kt b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/JenkinsTrigger.kt
@@ -35,7 +35,7 @@ data class JenkinsTrigger
   private var isStrategy: Boolean = false,
   val master: String,
   val job: String,
-  val buildNumber: Int,
+  val buildNumber: String?,
   val propertyFile: String?
 ) : Trigger {
 
@@ -102,7 +102,7 @@ class JenkinsBuildInfo
 @JsonCreator
 constructor(
   @param:JsonProperty("name") override val name: String?,
-  @param:JsonProperty("number") override val number: Int,
+  @param:JsonProperty("number") override val number: String?,
   @param:JsonProperty("url") override val url: String?,
   @param:JsonProperty("result") override val result: String?,
   @param:JsonProperty("artifacts") override val artifacts: List<JenkinsArtifact>?,
@@ -115,7 +115,7 @@ constructor(
   @JvmOverloads
   constructor(
     name: String,
-    number: Int,
+    number: String?,
     url: String,
     result: String,
     artifacts: List<JenkinsArtifact> = emptyList(),

diff --git a/...re/src/main/java/com/netflix/spinnaker/orca/pipeline/model/support/TriggerDeserializer.kt b/...re/src/main/java/com/netflix/spinnaker/orca/pipeline/model/support/TriggerDeserializer.kt
@@ -84,7 +84,7 @@ class TriggerDeserializer :
             get("strategy")?.booleanValue() == true,
             get("master").textValue(),
             get("job").textValue(),
-            get("buildNumber").intValue(),
+            get("buildNumber").textValue(),
             get("propertyFile")?.textValue()
           ).apply {
             buildInfo = get("buildInfo")?.parseValue(parser)

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/BuildDetailExtractor.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/BuildDetailExtractor.java
@@ -112,7 +112,9 @@ public boolean tryToExtractBuildDetails(BuildInfo<?> buildInfo, Map<String, Obje
       if (buildInfo == null || request == null) {
         return false;
       }
-      if (buildInfo.getUrl() != null && buildInfo.getName() != null && buildInfo.getNumber() > 0) {
+      if (buildInfo.getUrl() != null
+          && buildInfo.getName() != null
+          && buildInfo.getNumber() != null) {
         Map<String, Object> copyRequest = new HashMap<>();
         copyRequest.put("buildInfoUrl", buildInfo.getUrl());
         copyRequest.put("job", buildInfo.getName());