Skip to content

Commit

Permalink
fix(jenkins): Addresses startup issue when spinnaker.base-url.www i…
Browse files Browse the repository at this point in the history
…s not set (#4065)

Fixes spinnaker/spinnaker#6332
  • Loading branch information
ajordens committed Feb 9, 2021
1 parent f6671e8 commit ccc9378
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class MonitorQueuedJenkinsJobTask implements OverridableTimeoutRetryableTask {
private final String wwwBaseUrl

@Autowired
MonitorQueuedJenkinsJobTask(BuildService buildService, @Value("\${spinnaker.base-url.www}") String wwwBaseUrl) {
MonitorQueuedJenkinsJobTask(BuildService buildService, @Value("\${spinnaker.base-url.www:}") String wwwBaseUrl) {
this.buildService = buildService
this.wwwBaseUrl = wwwBaseUrl
}
Expand Down Expand Up @@ -85,7 +85,7 @@ class MonitorQueuedJenkinsJobTask implements OverridableTimeoutRetryableTask {
String jenkinsController,
String jobName,
Integer buildNumber) {
if (wwwBaseUrl == null) {
if (wwwBaseUrl == null || wwwBaseUrl.isEmpty()) {
log.info("Not creating backlink from Jenkins to Spinnaker, see https://spinnaker.io/setup/ci/jenkins/ for more info")
return
}
Expand Down

0 comments on commit ccc9378

Please sign in to comment.