Merge branch 'sh-add-sidekiq-logging-for-bad-ci' into 'master'

Log errors for failed pipeline creation in PostReceive

See merge request gitlab-org/gitlab-ce!32633

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb
index d9e607cd251..c3a4f3dbe3f 100644
--- a/spec/services/git/branch_push_service_spec.rb
+++ b/spec/services/git/branch_push_service_spec.rb
@@ -99,6 +99,20 @@ describe Git::BranchPushService, services: true do
       expect(pipeline).to be_push
       expect(Gitlab::Git::BRANCH_REF_PREFIX + pipeline.ref).to eq(ref)
     end
+
+    context 'when pipeline has errors' do
+      before do
+        config = YAML.dump({ test: { script: 'ls', only: ['feature'] } })
+        stub_ci_pipeline_yaml_file(config)
+      end
+
+      it 'reports an error' do
+        allow(Sidekiq).to receive(:server?).and_return(true)
+        expect(Sidekiq.logger).to receive(:warn)
+
+        expect { subject }.not_to change { Ci::Pipeline.count }
+      end
+    end
   end
 
   describe "Updates merge requests" do