diff options
author | Tiger <twatson@gitlab.com> | 2019-04-15 11:09:30 +1000 |
---|---|---|
committer | Tiger <twatson@gitlab.com> | 2019-04-15 12:44:00 +1000 |
commit | 781cd4a29d89ae2cd24329ca33d59b5d959617d2 (patch) | |
tree | 088694553309fae8d72976712defb72060d621f5 | |
parent | 0a99e0220d9371423039f05f700af3675b26624f (diff) | |
download | gitlab-ce-60480-rescue-build-preparing-errors.tar.gz |
Rescue and log errors raised when preparing builds60480-rescue-build-preparing-errors
https://gitlab.com/gitlab-org/gitlab-ce/issues/60480
-rw-r--r-- | app/services/ci/prepare_build_service.rb | 8 | ||||
-rw-r--r-- | spec/services/ci/prepare_build_service_spec.rb | 16 |
2 files changed, 20 insertions, 4 deletions
diff --git a/app/services/ci/prepare_build_service.rb b/app/services/ci/prepare_build_service.rb index 32f11438b79..3722faeb020 100644 --- a/app/services/ci/prepare_build_service.rb +++ b/app/services/ci/prepare_build_service.rb @@ -11,9 +11,11 @@ module Ci def execute prerequisites.each(&:complete!) - unless build.enqueue - build.drop!(:unmet_prerequisites) - end + build.enqueue! + rescue => e + Gitlab::Sentry.track_acceptable_exception(e, extra: { build_id: build.id }) + + build.drop(:unmet_prerequisites) end private diff --git a/spec/services/ci/prepare_build_service_spec.rb b/spec/services/ci/prepare_build_service_spec.rb index 1797f8f964f..2d027f13e52 100644 --- a/spec/services/ci/prepare_build_service_spec.rb +++ b/spec/services/ci/prepare_build_service_spec.rb @@ -38,7 +38,21 @@ describe Ci::PrepareBuildService do end it 'drops the build' do - expect(build).to receive(:drop!).with(:unmet_prerequisites).once + expect(build).to receive(:drop).with(:unmet_prerequisites).once + + subject + end + end + + context 'prerequisites raise an error' do + before do + allow(prerequisite).to receive(:complete!).and_raise Kubeclient::HttpError.new(401, 'unauthorized', nil) + end + + it 'drops the build and notifies Sentry' do + expect(build).to receive(:drop).with(:unmet_prerequisites).once + expect(Gitlab::Sentry).to receive(:track_acceptable_exception) + .with(instance_of(Kubeclient::HttpError), hash_including(extra: { build_id: build.id })) subject end |