diff --git a/gradle.properties b/gradle.properties index 14e5a8e8a..7753e3061 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ fiatVersion=1.42.0 -korkVersion=7.195.0 +korkVersion=7.196.0 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 targetJava11=true diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/JenkinsBuildMonitor.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/JenkinsBuildMonitor.groovy index 24b15b426..5d132274f 100644 --- a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/JenkinsBuildMonitor.groovy +++ b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/JenkinsBuildMonitor.groovy @@ -35,6 +35,7 @@ import com.netflix.spinnaker.igor.polling.PollingDelta import com.netflix.spinnaker.igor.service.BuildServices import com.netflix.spinnaker.kork.discovery.DiscoveryStatusListener import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService +import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException import com.netflix.spinnaker.security.AuthenticatedRequest import groovy.time.TimeCategory import org.springframework.beans.factory.annotation.Autowired @@ -42,7 +43,6 @@ import org.springframework.beans.factory.annotation.Value import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.scheduling.TaskScheduler import org.springframework.stereotype.Service -import retrofit.RetrofitError import java.util.stream.Collectors import static net.logstash.logback.argument.StructuredArguments.kv @@ -157,9 +157,8 @@ class JenkinsBuildMonitor extends CommonPollingMonitor> { throw runtimeException.getCause() } + def spinnakerServerException = new SpinnakerServerException(RetrofitError.unexpectedError("http://retro.fit/mock/error", new Exception('mock root cause'))); + jenkinsService.getBuilds('job2') >> { throw spinnakerServerException } jenkinsService.getBuilds('job3') >> [ new Build(number: 3, timestamp: nowMinus30min, building: false, result: 'SUCCESS', duration: durationOf1min)