fix(jenkins): Pass stage start time to Igor when kicking off a build (s…

…pinnaker#4045) * fix(jenkins): Pass stage start time to Igor when kicking off a build * fix(test): Fix up StartJenkinsJobTaskSpec
xlwcom · Jan 25, 2021 · 005617b · 005617b
1 parent 13f0358
commit 005617b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/BuildService.java b/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/BuildService.java
@@ -36,6 +36,11 @@ public Response build(String master, String jobName, Map<String, String> queryPa
     return igorService.build(master, encode(jobName), queryParams, "");
   }
 
+  public Response build(
+      String master, String jobName, Map<String, String> queryParams, String startTime) {
+    return igorService.build(master, encode(jobName), queryParams, startTime);
+  }
+
   public String stop(String master, String jobName, String queuedBuild, Integer buildNumber) {
     return igorService.stop(master, jobName, queuedBuild, buildNumber, "");
   }

diff --git a/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/IgorService.java b/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/IgorService.java
@@ -31,7 +31,7 @@ Response build(
       @Path("name") String master,
       @Path(encode = false, value = "jobName") String jobName,
       @QueryMap Map<String, String> queryParams,
-      @Body String ignored);
+      @Body String startTime);
 
   @PUT("/masters/{name}/jobs/{jobName}/stop/{queuedBuild}/{buildNumber}")
   String stop(

diff --git a/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/tasks/StartJenkinsJobTask.groovy b/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/tasks/StartJenkinsJobTask.groovy
@@ -57,7 +57,7 @@ class StartJenkinsJobTask implements RetryableTask {
     String job = stage.context.job
 
     try {
-      Response igorResponse = buildService.build(master, job, stage.context.parameters)
+      Response igorResponse = buildService.build(master, job, stage.context.parameters, stage.startTime.toString())
 
       if (igorResponse.getStatus() == HttpStatus.ACCEPTED.value()) {
         log.info("build for job=$job on master=$master is pending, waiting for build to start")

diff --git a/...igor/src/test/groovy/com/netflix/spinnaker/orca/igor/tasks/StartJenkinsJobTaskSpec.groovy b/...igor/src/test/groovy/com/netflix/spinnaker/orca/igor/tasks/StartJenkinsJobTaskSpec.groovy
@@ -51,7 +51,7 @@ class StartJenkinsJobTaskSpec extends Specification {
 
         and:
         task.buildService = Stub(BuildService) {
-          build(stage.context.master, stage.context.job, stage.context.parameters) >>
+          build(stage.context.master, stage.context.job, stage.context.parameters, stage.startTime.toString()) >>
               new Response("", 200, "OK", [], new TypedString(new ObjectMapper().writeValueAsString([result: 'SUCCESS', running: true, number: 4])))
         }
 
@@ -68,7 +68,7 @@ class StartJenkinsJobTaskSpec extends Specification {
 
       and:
       task.buildService = Stub(BuildService) {
-        build(stage.context.master, stage.context.job, stage.context.parameters) >>
+        build(stage.context.master, stage.context.job, stage.context.parameters, stage.startTime.toString()) >>
             new Response("", 200, "OK", [], new TypedString(new ObjectMapper().writeValueAsString([result: 'SUCCESS', running: true, number: 4])))
       }
 
@@ -85,7 +85,7 @@ class StartJenkinsJobTaskSpec extends Specification {
 
         and:
         task.buildService = Stub(BuildService) {
-            build(stage.context.master, stage.context.job, stage.context.parameters) >> {throw RetrofitError.unexpectedError("http://test", new RuntimeException())}
+            build(stage.context.master, stage.context.job, stage.context.parameters, stage.startTime.toString()) >> {throw RetrofitError.unexpectedError("http://test", new RuntimeException())}
         }
 
         when:
@@ -101,7 +101,7 @@ class StartJenkinsJobTaskSpec extends Specification {
 
     and:
     task.buildService = Stub(BuildService) {
-      build(stage.context.master, stage.context.job, stage.context.parameters) >>
+      build(stage.context.master, stage.context.job, stage.context.parameters, stage.startTime.toString()) >>
           new Response("", 202, "OK", [], null)
     }