fix(jenkins): Updated buildNumbers to be longs rather than an ints (s…

…pinnaker#4828)

Co-authored-by: Jason <[email protected]>

orca-igor/src/main/java/com/netflix/spinnaker/orca/igor/BuildService.java

@@ -42,7 +42,7 @@ public Response build(
     return igorService.build(master, encode(jobName), queryParams, startTime);
   }
 
-  public String stop(String master, String jobName, String queuedBuild, Integer buildNumber) {
+  public String stop(String master, String jobName, String queuedBuild, Long buildNumber) {
     return this.igorFeatureFlagProperties.isJobNameAsQueryParameter()
         ? igorService.stopWithJobNameAsQueryParameter(master, jobName, queuedBuild, buildNumber, "")
         : igorService.stop(master, jobName, queuedBuild, buildNumber, "");
@@ -52,28 +52,27 @@ public Map queuedBuild(String master, String item) {
     return igorService.queuedBuild(master, item);
   }
 
-  public Map<String, Object> getBuild(Integer buildNumber, String master, String job) {
+  public Map<String, Object> getBuild(Long buildNumber, String master, String job) {
     return this.igorFeatureFlagProperties.isJobNameAsQueryParameter()
         ? igorService.getBuildWithJobAsQueryParam(buildNumber, master, encode(job))
         : igorService.getBuild(buildNumber, master, encode(job));
   }
 
   public Map<String, Object> getPropertyFile(
-      Integer buildNumber, String fileName, String master, String job) {
+      Long buildNumber, String fileName, String master, String job) {
     return this.igorFeatureFlagProperties.isJobNameAsQueryParameter()
         ? igorService.getPropertyFileWithJobAsQueryParam(buildNumber, fileName, master, encode(job))
         : igorService.getPropertyFile(buildNumber, fileName, master, encode(job));
   }
 
-  public List<Artifact> getArtifacts(
-      Integer buildNumber, String fileName, String master, String job) {
+  public List<Artifact> getArtifacts(Long buildNumber, String fileName, String master, String job) {
     return this.igorFeatureFlagProperties.isJobNameAsQueryParameter()
         ? igorService.getArtifactsWithJobAsQueryParam(buildNumber, fileName, master, encode(job))
         : igorService.getArtifacts(buildNumber, fileName, master, encode(job));
   }
 
   public Response updateBuild(
-      String master, String jobName, Integer buildNumber, IgorService.UpdatedBuild updatedBuild) {
+      String master, String jobName, Long buildNumber, IgorService.UpdatedBuild updatedBuild) {
     return igorService.update(master, jobName, buildNumber, updatedBuild);
   }
 }

orca-igor/src/main/java/com/netflix/spinnaker/orca/igor/IgorService.java

@@ -39,49 +39,49 @@ String stop(
       @Path("name") String master,
       @Path(encode = false, value = "jobName") String jobName,
       @Path(encode = false, value = "queuedBuild") String queuedBuild,
-      @Path(encode = false, value = "buildNumber") Integer buildNumber,
+      @Path(encode = false, value = "buildNumber") Long buildNumber,
       @Body String ignored);
 
   @PUT("/masters/{name}/jobs/stop/{queuedBuild}/{buildNumber}")
   String stopWithJobNameAsQueryParameter(
       @Path("name") String master,
       @Query(value = "jobName") String jobName,
       @Path(encode = false, value = "queuedBuild") String queuedBuild,
-      @Path(encode = false, value = "buildNumber") Integer buildNumber,
+      @Path(encode = false, value = "buildNumber") Long buildNumber,
       @Body String ignored);
 
   @PATCH("/masters/{name}/jobs/{jobName}/update/{buildNumber}")
   Response update(
       @Path("name") String master,
       @Path(encode = false, value = "jobName") String jobName,
-      @Path(encode = false, value = "buildNumber") Integer buildNumber,
+      @Path(encode = false, value = "buildNumber") Long buildNumber,
       @Body UpdatedBuild updatedBuild);
 
   @GET("/builds/queue/{master}/{item}")
   Map queuedBuild(@Path("master") String master, @Path("item") String item);
 
   @GET("/builds/status/{buildNumber}/{master}/{job}")
   Map<String, Object> getBuild(
-      @Path("buildNumber") Integer buildNumber,
+      @Path("buildNumber") Long buildNumber,
       @Path("master") String master,
       @Path(encode = false, value = "job") String job);
 
   @GET("/builds/status/{buildNumber}/{master}")
   Map<String, Object> getBuildWithJobAsQueryParam(
-      @Path("buildNumber") Integer buildNumber,
+      @Path("buildNumber") Long buildNumber,
       @Path("master") String master,
       @Query(encodeValue = false, value = "job") String job);
 
   @GET("/builds/properties/{buildNumber}/{fileName}/{master}/{job}")
   Map<String, Object> getPropertyFile(
-      @Path("buildNumber") Integer buildNumber,
+      @Path("buildNumber") Long buildNumber,
       @Path("fileName") String fileName,
       @Path("master") String master,
       @Path(encode = false, value = "job") String job);
 
   @GET("/builds/properties/{buildNumber}/{fileName}/{master}")
   Map<String, Object> getPropertyFileWithJobAsQueryParam(
-      @Path("buildNumber") Integer buildNumber,
+      @Path("buildNumber") Long buildNumber,
       @Path("fileName") String fileName,
       @Path("master") String master,
       @Query(encodeValue = false, value = "job") String job);
@@ -95,14 +95,14 @@ List compareCommits(
 
   @GET("/builds/artifacts/{buildNumber}/{master}/{job}")
   List<Artifact> getArtifacts(
-      @Path("buildNumber") Integer buildNumber,
+      @Path("buildNumber") Long buildNumber,
       @Query("propertyFile") String propertyFile,
       @Path("master") String master,
       @Path(value = "job", encode = false) String job);
 
   @GET("/builds/artifacts/{buildNumber}/{master}")
   List<Artifact> getArtifactsWithJobAsQueryParam(
-      @Path("buildNumber") Integer buildNumber,
+      @Path("buildNumber") Long buildNumber,
       @Query("propertyFile") String propertyFile,
       @Path("master") String master,
       @Query(value = "job", encodeValue = false) String job);

orca-igor/src/main/java/com/netflix/spinnaker/orca/igor/model/CIStageDefinition.java

@@ -30,7 +30,7 @@ public class CIStageDefinition implements RetryableStageDefinition {
   private final String master;
   private final String job;
   private final String propertyFile;
-  private final Integer buildNumber;
+  private final Long buildNumber;
   private final BuildInfo buildInfo;
   private final boolean waitForCompletion;
   private final List<ExpectedArtifact> expectedArtifacts;
@@ -43,7 +43,7 @@ public CIStageDefinition(
       @JsonProperty("master") String master,
       @JsonProperty("job") String job,
       @JsonProperty("property") String propertyFile,
-      @JsonProperty("buildNumber") Integer buildNumber,
+      @JsonProperty("buildNumber") Long buildNumber,
       @JsonProperty("buildInfo") BuildInfo buildInfo,
       @JsonProperty("waitForCompletion") Boolean waitForCompletion,
       @JsonProperty("expectedArtifacts") List<ExpectedArtifact> expectedArtifacts,

orca-igor/src/main/java/com/netflix/spinnaker/orca/igor/tasks/WaitForConcourseJobCompletionTask.java

@@ -51,7 +51,7 @@ public TaskResult execute(@Nonnull StageExecution stage) {
 
     Map<String, Object> buildMap =
         buildService.getBuild(
-            (Integer) stage.getContext().get("buildNumber"), stageDefinition.getMaster(), jobPath);
+            (Long) stage.getContext().get("buildNumber"), stageDefinition.getMaster(), jobPath);
 
     ConcourseBuildInfo buildInfo = mapper.convertValue(buildMap, ConcourseBuildInfo.class);
 

orca-igor/src/test/groovy/com/netflix/spinnaker/orca/igor/BuildServiceSpec.groovy

@@ -24,7 +24,7 @@ class BuildServiceSpec extends Specification {
   IgorService igorService
 
   private static final MASTER = 'MASTER'
-  private static final BUILD_NUMBER = 123
+  private static final BUILD_NUMBER = 1234567890123
   private static final JOB_NAME = "name/with/slashes and spaces"
   private static final JOB_NAME_ENCODED = "name/with/slashes%20and%20spaces"
   private static final PARAMS = ['key': 'value']

orca-igor/src/test/groovy/com/netflix/spinnaker/orca/igor/BuildServiceSpecMock.groovy

@@ -43,7 +43,7 @@ class BuildServiceSpecMock extends Specification{
   @Subject BuildService buildService
 
   private static final MASTER = 'MASTER'
-  private static final BUILD_NUMBER = 123
+  private static final BUILD_NUMBER = 123456789012
   private static final JOB_NAME = "name/with/slashes and spaces"
   private static final JOB_NAME_ENCODED = "name/with/slashes%20and%20spaces"
   private static final PARAMS = ['key': 'value']