Add latest changes from gitlab-org/gitlab@master

2 files changed, 100 insertions, 25 deletions

diff --git a/spec/workers/pipeline_schedule_worker_spec.rb b/spec/workers/pipeline_schedule_worker_spec.rb
index d23907a8def..db58dc00338 100644
--- a/spec/workers/pipeline_schedule_worker_spec.rb
+++ b/spec/workers/pipeline_schedule_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe PipelineScheduleWorker do
+RSpec.describe PipelineScheduleWorker, :sidekiq_inline, feature_category: :continuous_integration do
   include ExclusiveLeaseHelpers
 
   subject { described_class.new.perform }
@@ -30,7 +30,7 @@ RSpec.describe PipelineScheduleWorker do
       project.add_maintainer(user)
     end
 
-    context 'when there is a scheduled pipeline within next_run_at', :sidekiq_inline do
+    context 'when there is a scheduled pipeline within next_run_at' do
       shared_examples 'successful scheduling' do
         it 'creates a new pipeline' do
           expect { subject }.to change { project.ci_pipelines.count }.by(1)
@@ -49,7 +49,19 @@ RSpec.describe PipelineScheduleWorker do
         end
       end
 
-      it_behaves_like 'successful scheduling'
+      shared_examples 'successful scheduling with/without ci_use_run_pipeline_schedule_worker' do
+        it_behaves_like 'successful scheduling'
+
+        context 'when feature flag ci_use_run_pipeline_schedule_worker is disabled' do
+          before do
+            stub_feature_flags(ci_use_run_pipeline_schedule_worker: false)
+          end
+
+          it_behaves_like 'successful scheduling'
+        end
+      end
+
+      it_behaves_like 'successful scheduling with/without ci_use_run_pipeline_schedule_worker'
 
       context 'when the latest commit contains [ci skip]' do
         before do
@@ -58,7 +70,7 @@ RSpec.describe PipelineScheduleWorker do
             .and_return('some commit [ci skip]')
         end
 
-        it_behaves_like 'successful scheduling'
+        it_behaves_like 'successful scheduling with/without ci_use_run_pipeline_schedule_worker'
       end
     end
 
@@ -123,4 +135,13 @@ RSpec.describe PipelineScheduleWorker do
       expect { subject }.not_to raise_error
     end
   end
+
+  context 'when max retry attempts reach' do
+    let!(:lease) { stub_exclusive_lease_taken(described_class.name.underscore) }
+
+    it 'does not raise error' do
+      expect(lease).to receive(:try_obtain).exactly(described_class::LOCK_RETRY + 1).times
+      expect { subject }.to raise_error(Gitlab::ExclusiveLeaseHelpers::FailedToObtainLockError)
+    end
+  end
 end
diff --git a/spec/workers/run_pipeline_schedule_worker_spec.rb b/spec/workers/run_pipeline_schedule_worker_spec.rb
index 4fdf6149435..cf06351b693 100644
--- a/spec/workers/run_pipeline_schedule_worker_spec.rb
+++ b/spec/workers/run_pipeline_schedule_worker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe RunPipelineScheduleWorker do
+RSpec.describe RunPipelineScheduleWorker, feature_category: :continuous_integration do
   it 'has an until_executed deduplicate strategy' do
     expect(described_class.get_deduplicate_strategy).to eq(:until_executed)
   end
@@ -56,37 +56,91 @@ RSpec.describe RunPipelineScheduleWorker do
       let(:create_pipeline_service) { instance_double(Ci::CreatePipelineService, execute: service_response) }
       let(:service_response) { instance_double(ServiceResponse, payload: pipeline, error?: false) }
 
-      before do
-        expect(Ci::CreatePipelineService).to receive(:new).with(project, user, ref: pipeline_schedule.ref).and_return(create_pipeline_service)
+      context 'when pipeline can be created' do
+        before do
+          expect(Ci::CreatePipelineService).to receive(:new).with(project, user, ref: pipeline_schedule.ref).and_return(create_pipeline_service)
 
-        expect(create_pipeline_service).to receive(:execute).with(:schedule, ignore_skip_ci: true, save_on_errors: false, schedule: pipeline_schedule).and_return(service_response)
-      end
+          expect(create_pipeline_service).to receive(:execute).with(:schedule, ignore_skip_ci: true, save_on_errors: false, schedule: pipeline_schedule).and_return(service_response)
+        end
+
+        context "when pipeline is persisted" do
+          let(:pipeline) { instance_double(Ci::Pipeline, persisted?: true) }
+
+          it "returns the service response" do
+            expect(worker.perform(pipeline_schedule.id, user.id)).to eq(service_response)
+          end
 
-      context "when pipeline is persisted" do
-        let(:pipeline) { instance_double(Ci::Pipeline, persisted?: true) }
+          it "does not log errors" do
+            expect(worker).not_to receive(:log_extra_metadata_on_done)
 
-        it "returns the service response" do
-          expect(worker.perform(pipeline_schedule.id, user.id)).to eq(service_response)
+            expect(worker.perform(pipeline_schedule.id, user.id)).to eq(service_response)
+          end
+
+          it "changes the next_run_at" do
+            expect { worker.perform(pipeline_schedule.id, user.id) }.to change { pipeline_schedule.reload.next_run_at }.by(1.day)
+          end
+
+          context 'when feature flag ci_use_run_pipeline_schedule_worker is disabled' do
+            before do
+              stub_feature_flags(ci_use_run_pipeline_schedule_worker: false)
+            end
+
+            it 'does not change the next_run_at' do
+              expect { worker.perform(pipeline_schedule.id, user.id) }.not_to change { pipeline_schedule.reload.next_run_at }
+            end
+          end
         end
 
-        it "does not log errors" do
-          expect(worker).not_to receive(:log_extra_metadata_on_done)
+        context "when pipeline was not persisted" do
+          let(:service_response) { instance_double(ServiceResponse, error?: true, message: "Error", payload: pipeline) }
+          let(:pipeline) { instance_double(Ci::Pipeline, persisted?: false) }
 
-          expect(worker.perform(pipeline_schedule.id, user.id)).to eq(service_response)
+          it "logs a pipeline creation error" do
+            expect(worker)
+              .to receive(:log_extra_metadata_on_done)
+              .with(:pipeline_creation_error, service_response.message)
+              .and_call_original
+
+            expect(worker.perform(pipeline_schedule.id, user.id)).to eq(service_response.message)
+          end
         end
       end
 
-      context "when pipeline was not persisted" do
-        let(:service_response) { instance_double(ServiceResponse, error?: true, message: "Error", payload: pipeline) }
-        let(:pipeline) { instance_double(Ci::Pipeline, persisted?: false) }
+      context 'when schedule is already executed' do
+        let(:time_in_future) { 1.hour.since }
+
+        before do
+          pipeline_schedule.update_column(:next_run_at, time_in_future)
+        end
+
+        it 'does not change the next_run_at' do
+          expect { worker.perform(pipeline_schedule.id, user.id) }.to not_change { pipeline_schedule.reload.next_run_at }
+        end
+
+        it 'does not create a pipeline' do
+          expect(Ci::CreatePipelineService).not_to receive(:new)
+
+          worker.perform(pipeline_schedule.id, user.id)
+        end
+
+        context 'when feature flag ci_use_run_pipeline_schedule_worker is disabled' do
+          let(:pipeline) { instance_double(Ci::Pipeline, persisted?: true) }
+
+          before do
+            stub_feature_flags(ci_use_run_pipeline_schedule_worker: false)
+
+            expect(Ci::CreatePipelineService).to receive(:new).with(project, user, ref: pipeline_schedule.ref).and_return(create_pipeline_service)
+
+            expect(create_pipeline_service).to receive(:execute).with(:schedule, ignore_skip_ci: true, save_on_errors: false, schedule: pipeline_schedule).and_return(service_response)
+          end
 
-        it "logs a pipeline creation error" do
-          expect(worker)
-            .to receive(:log_extra_metadata_on_done)
-            .with(:pipeline_creation_error, service_response.message)
-            .and_call_original
+          it 'does not change the next_run_at' do
+            expect { worker.perform(pipeline_schedule.id, user.id) }.to not_change { pipeline_schedule.reload.next_run_at }
+          end
 
-          expect(worker.perform(pipeline_schedule.id, user.id)).to eq(service_response.message)
+          it "returns the service response" do
+            expect(worker.perform(pipeline_schedule.id, user.id)).to eq(service_response)
+          end
         end
       end
     end