diff options
| -rw-r--r-- | app/models/ci/build.rb | 2 | ||||
| -rw-r--r-- | app/services/create_deployment_service.rb | 2 | ||||
| -rw-r--r-- | db/fixtures/development/17_cycle_analytics.rb | 9 | ||||
| -rw-r--r-- | spec/services/create_deployment_service_spec.rb | 1 | ||||
| -rw-r--r-- | spec/support/cycle_analytics_helpers.rb | 41 |
5 files changed, 40 insertions, 15 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 93d15fad9ba..f7a0849f05e 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -148,7 +148,7 @@ module Ci return @environment_url if defined?(@environment_url) @environment_url = - if unexpanded_url = options.dig(:environment, :url) + if unexpanded_url = options&.dig(:environment, :url) ExpandVariables.expand(unexpanded_url, simple_variables) else persisted_environment&.external_url diff --git a/app/services/create_deployment_service.rb b/app/services/create_deployment_service.rb index 8b42ff915ee..f30916093ce 100644 --- a/app/services/create_deployment_service.rb +++ b/app/services/create_deployment_service.rb @@ -46,7 +46,7 @@ class CreateDeploymentService end def environment_options - @environment_options ||= job.options[:environment] || {} + @environment_options ||= job.options&.dig(:environment) || {} end def on_stop diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb index 75457b2d369..7c1d758dada 100644 --- a/db/fixtures/development/17_cycle_analytics.rb +++ b/db/fixtures/development/17_cycle_analytics.rb @@ -212,12 +212,9 @@ class Gitlab::Seeder::CycleAnalytics merge_requests.each do |merge_request| Timecop.travel 12.hours.from_now - CreateDeploymentService.new(merge_request.project, @user, { - environment: 'production', - ref: 'master', - tag: false, - sha: @project.repository.commit('master').sha - }).execute + job = merge_request.head_pipeline.builds.where.not(environment: nil).last + + CreateDeploymentService.new(job).execute end end end diff --git a/spec/services/create_deployment_service_spec.rb b/spec/services/create_deployment_service_spec.rb index 9c0420be545..4bb0376f4fd 100644 --- a/spec/services/create_deployment_service_spec.rb +++ b/spec/services/create_deployment_service_spec.rb @@ -17,7 +17,6 @@ describe CreateDeploymentService, services: true do let(:service) { described_class.new(job) } describe '#execute' do - subject { service.execute } context 'when no environments exist' do diff --git a/spec/support/cycle_analytics_helpers.rb b/spec/support/cycle_analytics_helpers.rb index 66545127a44..7317ce6b907 100644 --- a/spec/support/cycle_analytics_helpers.rb +++ b/spec/support/cycle_analytics_helpers.rb @@ -51,12 +51,41 @@ module CycleAnalyticsHelpers end def deploy_master(environment: 'production') - CreateDeploymentService.new(project, user, { - environment: environment, - ref: 'master', - tag: false, - sha: project.repository.commit('master').sha - }).execute + dummy_job = + case environment + when 'production' + dummy_production_job + when 'staging' + dummy_staging_job + else + raise ArgumentError + end + + CreateDeploymentService.new(dummy_job).execute + end + + def dummy_production_job + @dummy_job ||= new_dummy_job('production') + end + + def dummy_staging_job + @dummy_job ||= new_dummy_job('staging') + end + + def dummy_pipeline + @dummy_pipeline ||= + Ci::Pipeline.new(sha: project.repository.commit('master').sha) + end + + def new_dummy_job(environment) + Ci::Build.new( + project: project, + user: user, + environment: environment, + ref: 'master', + tag: false, + name: 'dummy', + pipeline: dummy_pipeline) end end |