Skip to content

Commit

Permalink
fix(triggers): Ensure build number is present (#521)
Browse files Browse the repository at this point in the history
If the trigger payload has a `job` and `master` but not the `buildNumber`
echo will fail to kick off a pipeline without any warning
  • Loading branch information
marchello2000 authored Apr 15, 2019
1 parent b5e7bd9 commit a1c6097
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ protected Pipeline buildTrigger(Pipeline pipeline, Trigger manualTrigger) {
List<Artifact> artifacts = new ArrayList<>();
String master = manualTrigger.getMaster();
String job = manualTrigger.getJob();
if (buildInfoService.isPresent() && StringUtils.isNoneEmpty(master, job)) {
BuildEvent buildEvent = buildInfoService.get().getBuildEvent(master, job, manualTrigger.getBuildNumber());
Integer buildNumber = manualTrigger.getBuildNumber();
if (buildInfoService.isPresent() && StringUtils.isNoneEmpty(master, job) && buildNumber != null) {
BuildEvent buildEvent = buildInfoService.get().getBuildEvent(master, job, buildNumber);
trigger = trigger
.withBuildInfo(buildInfoService.get().getBuildInfo(buildEvent))
.withProperties(buildInfoService.get().getProperties(buildEvent, manualTrigger.getPropertyFile()));
Expand Down

0 comments on commit a1c6097

Please sign in to comment.