summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-06-24 10:36:32 +1200
committerThong Kuah <tkuah@gitlab.com>2019-06-24 10:37:47 +1200
commit26b057293d18f35367e39882f3724372b616dc51 (patch)
tree6ec358f45ce0e2a03ddc5f839b88915020cc01ac
parentf89a33c9d13db824bb4f4618512d82b6c4e6515a (diff)
downloadgitlab-ce-remove_create_deployment_from_build_success_worker.tar.gz
Remove deprecated call in BuildSuccessWorkerremove_create_deployment_from_build_success_worker
We now create_deployment on Ci::Build create. No need to call create_deployment again
-rw-r--r--app/workers/build_success_worker.rb12
-rw-r--r--spec/workers/build_success_worker_spec.rb44
2 files changed, 0 insertions, 56 deletions
diff --git a/app/workers/build_success_worker.rb b/app/workers/build_success_worker.rb
index 9a865fea621..ac947f3cf38 100644
--- a/app/workers/build_success_worker.rb
+++ b/app/workers/build_success_worker.rb
@@ -9,7 +9,6 @@ class BuildSuccessWorker
# rubocop: disable CodeReuse/ActiveRecord
def perform(build_id)
Ci::Build.find_by(id: build_id).try do |build|
- create_deployment(build) if build.has_environment?
stop_environment(build) if build.stops_environment?
end
end
@@ -18,17 +17,6 @@ class BuildSuccessWorker
private
##
- # Deprecated:
- # As of 11.5, we started creating a deployment record when ci_builds record is created.
- # Therefore we no longer need to create a deployment, after a build succeeded.
- # We're leaving this code for the transition period, but we can remove this code in 11.6.
- def create_deployment(build)
- build.create_deployment.try do |deployment|
- deployment.succeed
- end
- end
-
- ##
# TODO: This should be processed in DeploymentSuccessWorker once we started storing `action` value in `deployments` records
def stop_environment(build)
build.persisted_environment.fire_state_event(:stop)
diff --git a/spec/workers/build_success_worker_spec.rb b/spec/workers/build_success_worker_spec.rb
index ffe8796ded9..f4ff8cb15f8 100644
--- a/spec/workers/build_success_worker_spec.rb
+++ b/spec/workers/build_success_worker_spec.rb
@@ -6,51 +6,7 @@ describe BuildSuccessWorker do
describe '#perform' do
subject { described_class.new.perform(build.id) }
- before do
- allow_any_instance_of(Deployment).to receive(:create_ref)
- end
-
context 'when build exists' do
- context 'when deployment was not created with the build creation' do # An edge case during the transition period
- let!(:build) { create(:ci_build, :deploy_to_production) }
-
- before do
- allow(Deployments::FinishedWorker).to receive(:perform_async)
- Deployment.delete_all
- build.reload
- end
-
- it 'creates a successful deployment' do
- expect(build).not_to be_has_deployment
-
- subject
-
- build.reload
- expect(build).to be_has_deployment
- expect(build.deployment).to be_success
- end
- end
-
- context 'when deployment was created with the build creation' do # Counter part of the above edge case
- let!(:build) { create(:ci_build, :deploy_to_production) }
-
- it 'does not create a new deployment' do
- expect(build).to be_has_deployment
-
- expect { subject }.not_to change { Deployment.count }
- end
- end
-
- context 'when build is not associated with project' do
- let!(:build) { create(:ci_build, project: nil) }
-
- it 'does not create deployment' do
- subject
-
- expect(build.reload).not_to be_has_deployment
- end
- end
-
context 'when the build will stop an environment' do
let!(:build) { create(:ci_build, :stop_review_app, environment: environment.name, project: environment.project) }
let(:environment) { create(:environment, state: :available) }