diff options
33 files changed, 720 insertions, 144 deletions
diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb index 0a009477d61..bd4102d4531 100644 --- a/app/controllers/projects/deployments_controller.rb +++ b/app/controllers/projects/deployments_controller.rb @@ -6,7 +6,7 @@ class Projects::DeploymentsController < Projects::ApplicationController # rubocop: disable CodeReuse/ActiveRecord def index - deployments = environment.deployments.reorder(created_at: :desc) + deployments = environment.deployments.deployed.reorder(created_at: :desc) deployments = deployments.where('created_at > ?', params[:after].to_time) if params[:after]&.to_time render json: { deployments: DeploymentSerializer.new(project: project) @@ -47,7 +47,7 @@ class Projects::DeploymentsController < Projects::ApplicationController # rubocop: disable CodeReuse/ActiveRecord def deployment - @deployment ||= environment.deployments.find_by(iid: params[:id]) + @deployment ||= environment.deployments.deployed.find_by(iid: params[:id]) end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index de10783df1a..ab3ad9bf090 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -58,7 +58,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController # rubocop: disable CodeReuse/ActiveRecord def show - @deployments = environment.deployments.order(id: :desc).page(params[:page]) + @deployments = environment.deployments.deployed.order(id: :desc).page(params[:page]) end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/finders/environments_finder.rb b/app/finders/environments_finder.rb index 419be46fafe..156d49745c9 100644 --- a/app/finders/environments_finder.rb +++ b/app/finders/environments_finder.rb @@ -9,7 +9,7 @@ class EnvironmentsFinder # rubocop: disable CodeReuse/ActiveRecord def execute - deployments = project.deployments + deployments = project.deployments.deployed deployments = if ref deployments_query = params[:with_tags] ? 'ref = :ref OR tag IS TRUE' : 'ref = :ref' diff --git a/app/models/concerns/deployable.rb b/app/models/concerns/deployable.rb index f4f1989f0a9..d85d624fff3 100644 --- a/app/models/concerns/deployable.rb +++ b/app/models/concerns/deployable.rb @@ -7,7 +7,7 @@ module Deployable after_create :create_deployment def create_deployment - return unless starts_environment? && !has_deployment? + return unless has_environment? && !has_deployment? environment = project.environments.find_or_create_by( name: expanded_environment_name @@ -21,7 +21,8 @@ module Deployable sha: sha, user: user, deployable: self, - on_stop: on_stop).tap do |_| + on_stop: on_stop, + action: environment_action).tap do |_| self.reload # Reload relationships end end diff --git a/app/models/deployment.rb b/app/models/deployment.rb index 54a900a3b85..322b3139759 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -18,6 +18,8 @@ class Deployment < ActiveRecord::Base delegate :name, to: :environment, prefix: true scope :for_environment, -> (environment) { where(environment_id: environment) } + scope :deployed, -> { success.start } + scope :stopped, -> { success.stop } state_machine :status, initial: :created do event :run do @@ -55,6 +57,11 @@ class Deployment < ActiveRecord::Base canceled: 4 } + enum action: { + start: 1, + stop: 2 + } + def self.last_for_environment(environment) ids = self .for_environment(environment) @@ -130,7 +137,7 @@ class Deployment < ActiveRecord::Base def previous_deployment @previous_deployment ||= - project.deployments.joins(:environment) + project.deployments.deployed.joins(:environment) .where(environments: { name: self.environment.name }, ref: self.ref) .where.not(id: self.id) .take @@ -175,6 +182,14 @@ class Deployment < ActiveRecord::Base metrics&.merge(deployment_time: finished_at.to_i) || {} end + def deployed? + success? && start? + end + + def stopped? + success? && stop? + end + private def prometheus_adapter diff --git a/app/models/environment.rb b/app/models/environment.rb index 7d104bb0c25..1a535ba6b18 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -8,9 +8,9 @@ class Environment < ActiveRecord::Base belongs_to :project, required: true - has_many :deployments, -> { success }, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent + has_many :deployments, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent - has_one :last_deployment, -> { success.order('deployments.id DESC') }, class_name: 'Deployment' + has_one :last_deployment, -> { deployed.order('deployments.id DESC') }, class_name: 'Deployment' before_validation :nullify_external_url before_validation :generate_slug, if: ->(env) { env.slug.blank? } @@ -50,6 +50,7 @@ class Environment < ActiveRecord::Base scope :in_review_folder, -> { where(environment_type: "review") } scope :for_name, -> (name) { where(name: name) } scope :for_project, -> (project) { where(project_id: project) } + scope :with_deployment, -> (sha) { where('EXISTS (?)', Deployment.select(1).start.where('deployments.environment_id = environments.id').where(sha: sha)) } state_machine :state, initial: :available do event :start do @@ -95,22 +96,13 @@ class Environment < ActiveRecord::Base end def last_deployed_at - last_deployment.try(:created_at) + last_deployment.try(:finished_at) end def update_merge_request_metrics? folder_name == "production" end - def first_deployment_for(commit_sha) - ref = project.repository.ref_name_for_sha(ref_path, commit_sha) - - return nil unless ref - - deployment_iid = ref.split('/').last - deployments.find_by(iid: deployment_iid) - end - def ref_path "refs/#{Repository::REF_ENVIRONMENTS}/#{slug}" end diff --git a/app/models/environment_status.rb b/app/models/environment_status.rb index 7efc8da09ad..b33c4f2738d 100644 --- a/app/models/environment_status.rb +++ b/app/models/environment_status.rb @@ -8,17 +8,16 @@ class EnvironmentStatus delegate :id, to: :environment delegate :name, to: :environment delegate :project, to: :environment - delegate :status, to: :deployment, allow_nil: true delegate :deployed_at, to: :deployment, allow_nil: true def self.for_merge_request(mr, user) - build_environments_status(mr, user, mr.head_pipeline) + build_environments_status(mr, user, mr.diff_head_sha) end def self.after_merge_request(mr, user) return [] unless mr.merged? - build_environments_status(mr, user, mr.merge_pipeline) + build_environments_status(mr, user, mr.merge_commit_sha) end def initialize(environment, merge_request, sha) @@ -29,7 +28,7 @@ class EnvironmentStatus def deployment strong_memoize(:deployment) do - environment.first_deployment_for(sha) + environment.deployments.start.find_by_sha(sha) end end @@ -44,6 +43,20 @@ class EnvironmentStatus .merge_request_diff_files.where(deleted_file: false) end + ## + # Since frontend has not supported all statuses yet, BE has to + # proxy some status to a supported status. + def status + case deployment.status + when 'created' + 'running' + when 'canceled' + 'failed' + else + deployment.status + end + end + private PAGE_EXTENSIONS = /\A\.(s?html?|php|asp|cgi|pl)\z/i.freeze @@ -61,21 +74,14 @@ class EnvironmentStatus } end - def self.build_environments_status(mr, user, pipeline) - return [] unless pipeline.present? + def self.build_environments_status(mr, user, sha) + Environment.where(project_id: [mr.source_project_id, mr.target_project_id]) + .available + .with_deployment(sha).map do |environment| + next unless Ability.allowed?(user, :read_environment, environment) - find_environments(user, pipeline).map do |environment| - EnvironmentStatus.new(environment, mr, pipeline.sha) - end + EnvironmentStatus.new(environment, mr, sha) + end.compact end private_class_method :build_environments_status - - def self.find_environments(user, pipeline) - env_ids = Deployment.where(deployable: pipeline.builds).select(:environment_id) - - Environment.available.where(id: env_ids).select do |environment| - Ability.allowed?(user, :read_environment, environment) - end - end - private_class_method :find_environments end diff --git a/app/models/project.rb b/app/models/project.rb index d5a4ae79c47..d3b148d0ac0 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -254,7 +254,7 @@ class Project < ActiveRecord::Base has_many :variables, class_name: 'Ci::Variable' has_many :triggers, class_name: 'Ci::Trigger' has_many :environments - has_many :deployments, -> { success } + has_many :deployments has_many :pipeline_schedules, class_name: 'Ci::PipelineSchedule' has_many :project_deploy_tokens has_many :deploy_tokens, through: :project_deploy_tokens diff --git a/app/services/update_deployment_service.rb b/app/services/start_environment_service.rb index aa7fcca1e2a..138ee55f6dc 100644 --- a/app/services/update_deployment_service.rb +++ b/app/services/start_environment_service.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class UpdateDeploymentService +class StartEnvironmentService attr_reader :deployment attr_reader :deployable @@ -13,6 +13,8 @@ class UpdateDeploymentService end def execute + return unless deployment.deployed? + deployment.create_ref deployment.invalidate_cache @@ -20,10 +22,9 @@ class UpdateDeploymentService environment.external_url = expanded_environment_url if expanded_environment_url - environment.fire_state_event(action) + environment.fire_state_event(:start) break unless environment.save - break if environment.stopped? deployment.tap(&:update_merge_request_metrics!) end @@ -46,8 +47,4 @@ class UpdateDeploymentService def environment_url environment_options[:url] end - - def action - environment_options[:action] || 'start' - end end diff --git a/app/services/stop_environment_service.rb b/app/services/stop_environment_service.rb new file mode 100644 index 00000000000..79dbf292123 --- /dev/null +++ b/app/services/stop_environment_service.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class StopEnvironmentService + attr_reader :deployment + + delegate :environment, to: :deployment + + def initialize(deployment) + @deployment = deployment + end + + def execute + return unless deployment.stopped? + + environment.fire_state_event(:stop) + environment.expire_etag_cache + end +end diff --git a/app/workers/build_success_worker.rb b/app/workers/build_success_worker.rb index 9a865fea621..f3530317090 100644 --- a/app/workers/build_success_worker.rb +++ b/app/workers/build_success_worker.rb @@ -10,7 +10,6 @@ class BuildSuccessWorker 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 # rubocop: enable CodeReuse/ActiveRecord @@ -27,10 +26,4 @@ class BuildSuccessWorker 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) - end end diff --git a/app/workers/deployments/success_worker.rb b/app/workers/deployments/success_worker.rb index da517f3fb26..68fe8997f12 100644 --- a/app/workers/deployments/success_worker.rb +++ b/app/workers/deployments/success_worker.rb @@ -8,9 +8,11 @@ module Deployments def perform(deployment_id) Deployment.find_by_id(deployment_id).try do |deployment| - break unless deployment.success? - - UpdateDeploymentService.new(deployment).execute + if deployment.deployed? + StartEnvironmentService.new(deployment).execute + elsif deployment.stopped? + StopEnvironmentService.new(deployment).execute + end end end end diff --git a/changelogs/unreleased/add-action-to-deployment.yml b/changelogs/unreleased/add-action-to-deployment.yml new file mode 100644 index 00000000000..4629f762ae8 --- /dev/null +++ b/changelogs/unreleased/add-action-to-deployment.yml @@ -0,0 +1,5 @@ +--- +title: Fix environment status in merge request widget +merge_request: 22799 +author: +type: changed diff --git a/db/fixtures/development/14_pipelines.rb b/db/fixtures/development/14_pipelines.rb index 5af77c49913..e4272cbee33 100644 --- a/db/fixtures/development/14_pipelines.rb +++ b/db/fixtures/development/14_pipelines.rb @@ -43,12 +43,14 @@ class Gitlab::Seeder::Pipelines # deploy stage { name: 'staging', stage: 'deploy', environment: 'staging', status_event: :success, - options: { environment: { action: 'start', on_stop: 'stop staging' } }, + options: { environment: { name: 'staging', action: 'start', on_stop: 'stop staging' } }, queued_at: 7.hour.ago, started_at: 6.hour.ago, finished_at: 4.hour.ago }, { name: 'stop staging', stage: 'deploy', environment: 'staging', - when: 'manual', status: :skipped }, + when: 'manual', status: :skipped, + options: { environment: { name: 'staging', action: 'stop' } } }, { name: 'production', stage: 'deploy', environment: 'production', - when: 'manual', status: :skipped }, + when: 'manual', status: :skipped, + options: { environment: { name: 'production' } } }, # notify stage { name: 'slack', stage: 'notify', when: 'manual', status: :success }, diff --git a/db/fixtures/development/19_environments.rb b/db/fixtures/development/19_environments.rb index 3e227928a29..031a04ac76b 100644 --- a/db/fixtures/development/19_environments.rb +++ b/db/fixtures/development/19_environments.rb @@ -45,14 +45,18 @@ class Gitlab::Seeder::Environments end def create_deployment!(project, name, ref, sha) - environment = find_or_create_environment!(project, name) - environment.deployments.create!( - project: project, - ref: ref, - sha: sha, - tag: false, - deployable: find_deployable(project, name) - ) + find_deployable(project, name).try do |deployable| + environment = find_or_create_environment!(project, name) + environment.deployments.create!( + project: project, + ref: ref, + sha: sha, + tag: false, + deployable: deployable + ).tap do |deployment| + deployment.succeed! + end + end end def find_or_create_environment!(project, name) diff --git a/db/migrate/20181030150739_add_action_to_deployments.rb b/db/migrate/20181030150739_add_action_to_deployments.rb new file mode 100644 index 00000000000..a8c3a8ee69c --- /dev/null +++ b/db/migrate/20181030150739_add_action_to_deployments.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +class AddActionToDeployments < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DEPLOYMENT_ACTION_START = 1 # Equivalent to Deployment.actions['start'] + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default(:deployments, + :action, + :integer, + limit: 2, + default: DEPLOYMENT_ACTION_START, + allow_null: false) + end + + def down + remove_column(:deployments, :action) + end +end diff --git a/db/migrate/20181106135939_add_index_to_deployments.rb b/db/migrate/20181106135939_add_index_to_deployments.rb new file mode 100644 index 00000000000..b29c6766b11 --- /dev/null +++ b/db/migrate/20181106135939_add_index_to_deployments.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class AddIndexToDeployments < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_index :deployments, [:project_id, :action, :status] + add_concurrent_index :deployments, [:environment_id, :action, :status] + add_concurrent_index :deployments, [:environment_id, :action, :sha] + add_concurrent_index :deployments, [:finished_at] + end + + def down + remove_concurrent_index :deployments, [:project_id, :action, :status] + remove_concurrent_index :deployments, [:environment_id, :action, :status] + remove_concurrent_index :deployments, [:environment_id, :action, :sha] + remove_concurrent_index :deployments, [:finished_at] + end +end diff --git a/db/schema.rb b/db/schema.rb index fe30c5375f4..40fc0b24501 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20181101144347) do +ActiveRecord::Schema.define(version: 20181106135939) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -827,14 +827,19 @@ ActiveRecord::Schema.define(version: 20181101144347) do t.string "on_stop" t.integer "status", limit: 2, default: 2, null: false t.datetime_with_timezone "finished_at" + t.integer "action", limit: 2, default: 1, null: false end add_index "deployments", ["created_at"], name: "index_deployments_on_created_at", using: :btree add_index "deployments", ["deployable_type", "deployable_id"], name: "index_deployments_on_deployable_type_and_deployable_id", using: :btree + add_index "deployments", ["environment_id", "action", "sha"], name: "index_deployments_on_environment_id_and_action_and_sha", using: :btree + add_index "deployments", ["environment_id", "action", "status"], name: "index_deployments_on_environment_id_and_action_and_status", using: :btree add_index "deployments", ["environment_id", "id"], name: "index_deployments_on_environment_id_and_id", using: :btree add_index "deployments", ["environment_id", "iid", "project_id"], name: "index_deployments_on_environment_id_and_iid_and_project_id", using: :btree add_index "deployments", ["environment_id", "status"], name: "index_deployments_on_environment_id_and_status", using: :btree + add_index "deployments", ["finished_at"], name: "index_deployments_on_finished_at", using: :btree add_index "deployments", ["id"], name: "partial_index_deployments_for_legacy_successful_deployments", where: "((finished_at IS NULL) AND (status = 2))", using: :btree + add_index "deployments", ["project_id", "action", "status"], name: "index_deployments_on_project_id_and_action_and_status", using: :btree add_index "deployments", ["project_id", "iid"], name: "index_deployments_on_project_id_and_iid", unique: true, using: :btree add_index "deployments", ["project_id", "status"], name: "index_deployments_on_project_id_and_status", using: :btree diff --git a/lib/api/deployments.rb b/lib/api/deployments.rb index 6747e2e5005..2fb8551543a 100644 --- a/lib/api/deployments.rb +++ b/lib/api/deployments.rb @@ -24,7 +24,7 @@ module API get ':id/deployments' do authorize! :read_deployment, user_project - present paginate(user_project.deployments.order(params[:order_by] => params[:sort])), with: Entities::Deployment + present paginate(user_project.deployments.deployed.order(params[:order_by] => params[:sort])), with: Entities::Deployment end # rubocop: enable CodeReuse/ActiveRecord @@ -38,7 +38,7 @@ module API get ':id/deployments/:deployment_id' do authorize! :read_deployment, user_project - deployment = user_project.deployments.find(params[:deployment_id]) + deployment = user_project.deployments.deployed.find(params[:deployment_id]) present deployment, with: Entities::Deployment end diff --git a/lib/gitlab/cycle_analytics/summary/deploy.rb b/lib/gitlab/cycle_analytics/summary/deploy.rb index 099d798aac6..b1c644f77f3 100644 --- a/lib/gitlab/cycle_analytics/summary/deploy.rb +++ b/lib/gitlab/cycle_analytics/summary/deploy.rb @@ -7,7 +7,7 @@ module Gitlab end def value - @value ||= @project.deployments.where("created_at > ?", @from).count + @value ||= @project.deployments.deployed.where("finished_at > ?", @from).count end end end diff --git a/spec/factories/deployments.rb b/spec/factories/deployments.rb index 011c98599a3..483a906e31f 100644 --- a/spec/factories/deployments.rb +++ b/spec/factories/deployments.rb @@ -47,5 +47,13 @@ FactoryBot.define do deployment.succeed! end end + + trait :start do + action :start + end + + trait :stop do + action :stop + end end end diff --git a/spec/features/merge_request/user_sees_deployment_widget_spec.rb b/spec/features/merge_request/user_sees_deployment_widget_spec.rb index 0e439c8cb2d..53598b10fb1 100644 --- a/spec/features/merge_request/user_sees_deployment_widget_spec.rb +++ b/spec/features/merge_request/user_sees_deployment_widget_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe 'Merge request > User sees deployment widget', :js do - describe 'when deployed to an environment' do + describe 'when merge request has associated environments' do let(:user) { create(:user) } let(:project) { create(:project, :repository) } let(:merge_request) { create(:merge_request, :merged, source_project: project) } @@ -10,30 +10,126 @@ describe 'Merge request > User sees deployment widget', :js do let(:ref) { merge_request.target_branch } let(:sha) { project.commit(ref).id } let(:pipeline) { create(:ci_pipeline_without_jobs, sha: sha, project: project, ref: ref) } - let(:build) { create(:ci_build, :success, pipeline: pipeline) } - let!(:deployment) { create(:deployment, :succeed, environment: environment, sha: sha, ref: ref, deployable: build) } let!(:manual) { } before do merge_request.update!(merge_commit_sha: sha) project.add_user(user, role) sign_in(user) - visit project_merge_request_path(project, merge_request) - wait_for_requests end - it 'displays that the environment is deployed' do - wait_for_requests + context 'when deployment is to start an environment' do + context 'when deployment succeeded' do + let(:build) { create(:ci_build, :success, pipeline: pipeline) } + let!(:deployment) { create(:deployment, :succeed, environment: environment, sha: sha, ref: ref, deployable: build) } - expect(page).to have_content("Deployed to #{environment.name}") - expect(find('.js-deploy-time')['data-original-title']).to eq(deployment.created_at.to_time.in_time_zone.to_s(:medium)) + it 'displays that the environment is deployed' do + visit project_merge_request_path(project, merge_request) + wait_for_requests + + expect(page).to have_content("Deployed to #{environment.name}") + expect(find('.js-deploy-time')['data-original-title']).to eq(deployment.created_at.to_time.in_time_zone.to_s(:medium)) + end + end + + context 'when deployment failed' do + let(:build) { create(:ci_build, :failed, pipeline: pipeline) } + let!(:deployment) { create(:deployment, :failed, environment: environment, sha: sha, ref: ref, deployable: build) } + + it 'displays that the deployment failed' do + visit project_merge_request_path(project, merge_request) + wait_for_requests + + expect(page).to have_content("Failed to deploy to #{environment.name}") + expect(page).not_to have_css('.js-deploy-time') + end + end + + context 'when deployment running' do + let(:build) { create(:ci_build, :running, pipeline: pipeline) } + let!(:deployment) { create(:deployment, :running, environment: environment, sha: sha, ref: ref, deployable: build) } + + it 'displays that the running deployment' do + visit project_merge_request_path(project, merge_request) + wait_for_requests + + expect(page).to have_content("Deploying to #{environment.name}") + expect(page).not_to have_css('.js-deploy-time') + end + end + + context 'when deployment will happen' do + let(:build) { create(:ci_build, :created, pipeline: pipeline) } + let!(:deployment) { create(:deployment, environment: environment, sha: sha, ref: ref, deployable: build) } + + it 'displays that the environment name' do + visit project_merge_request_path(project, merge_request) + wait_for_requests + + expect(page).to have_content("Deploying to #{environment.name}") + expect(page).not_to have_css('.js-deploy-time') + end + end + end + + context 'when deployment is to stop an environment' do + context 'when the stop action succeeded' do + let(:build) { create(:ci_build, :success, pipeline: pipeline) } + let!(:deployment) { create(:deployment, :succeed, :stop, environment: environment, sha: sha, ref: ref, deployable: build) } + + it 'does not display deployment info' do + visit project_merge_request_path(project, merge_request) + wait_for_requests + + expect(page).not_to have_css('.deployment-info') + end + end + + context 'when the stop action failed' do + let(:build) { create(:ci_build, :failed, pipeline: pipeline) } + let!(:deployment) { create(:deployment, :failed, :stop, environment: environment, sha: sha, ref: ref, deployable: build) } + + it 'does not display deployment info' do + visit project_merge_request_path(project, merge_request) + wait_for_requests + + expect(page).not_to have_css('.deployment-info') + end + end + + context 'when the stop action is running' do + let(:build) { create(:ci_build, :running, pipeline: pipeline) } + let!(:deployment) { create(:deployment, :running, :stop, environment: environment, sha: sha, ref: ref, deployable: build) } + + it 'does not display deployment info' do + visit project_merge_request_path(project, merge_request) + wait_for_requests + + expect(page).not_to have_css('.deployment-info') + end + end + + context 'when the stop action will happen' do + let(:build) { create(:ci_build, :created, pipeline: pipeline) } + let!(:deployment) { create(:deployment, :stop, environment: environment, sha: sha, ref: ref, deployable: build) } + + it 'does not display deployment info' do + visit project_merge_request_path(project, merge_request) + wait_for_requests + + expect(page).not_to have_css('.deployment-info') + end + end end context 'with stop action' do + let(:build) { create(:ci_build, :success, pipeline: pipeline) } + let!(:deployment) { create(:deployment, :succeed, environment: environment, sha: sha, ref: ref, deployable: build) } let(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') } before do deployment.update!(on_stop: manual.name) + visit project_merge_request_path(project, merge_request) wait_for_requests end diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb index 056f4ee2e22..d12fe24714b 100644 --- a/spec/features/projects/environments/environment_spec.rb +++ b/spec/features/projects/environments/environment_spec.rb @@ -43,6 +43,58 @@ describe 'Environment' do end end + context 'when there is a successful deployment' do + let(:pipeline) { create(:ci_pipeline, project: project) } + let(:build) { create(:ci_build, :success, pipeline: pipeline) } + + let(:deployment) do + create(:deployment, :success, environment: environment, deployable: build) + end + + it 'does show deployments' do + expect(page).to have_link("#{build.name} (##{build.id})") + end + end + + context 'when there is a running deployment' do + let(:pipeline) { create(:ci_pipeline, project: project) } + let(:build) { create(:ci_build, pipeline: pipeline) } + + let(:deployment) do + create(:deployment, :running, environment: environment, deployable: build) + end + + it 'does show no deployments' do + expect(page).to have_content('You don\'t have any deployments right now.') + end + end + + context 'when there is a failed deployment' do + let(:pipeline) { create(:ci_pipeline, project: project) } + let(:build) { create(:ci_build, pipeline: pipeline) } + + let(:deployment) do + create(:deployment, :failed, environment: environment, deployable: build) + end + + it 'does show no deployments' do + expect(page).to have_content('You don\'t have any deployments right now.') + end + end + + context 'when there is a successful stop action' do + let(:pipeline) { create(:ci_pipeline, project: project) } + let(:build) { create(:ci_build, :success, pipeline: pipeline) } + + let(:deployment) do + create(:deployment, :success, :stop, environment: environment, deployable: build) + end + + it 'does show no deployments' do + expect(page).to have_content('You don\'t have any deployments right now.') + end + end + context 'with related deployable present' do let(:pipeline) { create(:ci_pipeline, project: project) } let(:build) { create(:ci_build, pipeline: pipeline) } diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb index d0ddf69d574..b3eabcb7903 100644 --- a/spec/features/projects/environments/environments_spec.rb +++ b/spec/features/projects/environments/environments_spec.rb @@ -128,7 +128,7 @@ describe 'Environments page', :js do end end - context 'when there are deployments' do + context 'when there are successful deployments' do let(:project) { create(:project, :repository) } let!(:deployment) do @@ -328,6 +328,39 @@ describe 'Environments page', :js do end end end + + context 'when there is a failed deployment' do + let(:project) { create(:project, :repository) } + + let!(:deployment) do + create(:deployment, :failed, + environment: environment, + sha: project.commit.id) + end + + it 'does not show deployments' do + visit_environments(project) + + expect(page).to have_content('No deployments yet') + end + end + + context 'when there is a successful stop action' do + let(:project) { create(:project, :repository) } + + let!(:deployment) do + create(:deployment, :success, + :stop, + environment: environment, + sha: project.commit.id) + end + + it 'does not show deployments' do + visit_environments(project) + + expect(page).to have_content('No deployments yet') + end + end end it 'does have a new environment button' do diff --git a/spec/models/concerns/deployable_spec.rb b/spec/models/concerns/deployable_spec.rb index ac79c75a55e..9551ff4b13b 100644 --- a/spec/models/concerns/deployable_spec.rb +++ b/spec/models/concerns/deployable_spec.rb @@ -22,13 +22,17 @@ describe Deployable do expect(deployment.on_stop).to eq('stop_review_app') expect(environment.name).to eq('review/master') end + + it 'updates action column to start' do + expect(deployment).to be_start + end end - context 'when the deployable object will stop an environment' do + context 'when the deployable object will stop the review app' do let!(:job) { create(:ci_build, :stop_review_app) } - it 'does not create a deployment record' do - expect(deployment).to be_nil + it 'updates action column to stop' do + expect(deployment).to be_stop end end diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb index 270b2767c68..b5696c73339 100644 --- a/spec/models/deployment_spec.rb +++ b/spec/models/deployment_spec.rb @@ -191,6 +191,150 @@ describe Deployment do end end + describe '.deployed' do + subject { described_class.deployed } + + context 'when deployment starts an environment' do + context 'when the action was successful' do + let!(:deployment) { create(:deployment, :start, :success) } + + it 'returns the deployment' do + is_expected.to eq([deployment]) + end + end + + context 'when the action failed' do + let!(:deployment) { create(:deployment, :start, :failed) } + + it 'returns nothing' do + is_expected.to be_empty + end + end + end + + context 'when deployment stops an environment' do + context 'when the action was successful' do + let!(:deployment) { create(:deployment, :stop, :success) } + + it 'returns nothing' do + is_expected.to be_empty + end + end + + context 'when the action failed' do + let!(:deployment) { create(:deployment, :stop, :failed) } + + it 'returns nothing' do + is_expected.to be_empty + end + end + end + end + + describe '.stopped' do + subject { described_class.stopped } + + context 'when deployment starts an environment' do + context 'when the action was successful' do + let!(:deployment) { create(:deployment, :start, :success) } + + it 'returns nothing' do + is_expected.to be_empty + end + end + + context 'when the action failed' do + let!(:deployment) { create(:deployment, :start, :failed) } + + it 'returns nothing' do + is_expected.to be_empty + end + end + end + + context 'when deployment stops an environment' do + context 'when the action was successful' do + let!(:deployment) { create(:deployment, :stop, :success) } + + it 'returns the deployment' do + is_expected.to eq([deployment]) + end + end + + context 'when the action failed' do + let!(:deployment) { create(:deployment, :stop, :failed) } + + it 'returns nothing' do + is_expected.to be_empty + end + end + end + end + + describe '#deployed?' do + subject { deployment.deployed? } + + context 'when deployment starts an environment' do + context 'when the action was successful' do + let!(:deployment) { create(:deployment, :start, :success) } + + it { is_expected.to be_truthy } + end + + context 'when the action failed' do + let!(:deployment) { create(:deployment, :start, :failed) } + + it { is_expected.to be_falsy } + end + end + + context 'when deployment stops an environment' do + context 'when the action was successful' do + let!(:deployment) { create(:deployment, :stop, :success) } + + it { is_expected.to be_falsy } + end + + context 'when the action failed' do + let!(:deployment) { create(:deployment, :stop, :failed) } + + it { is_expected.to be_falsy } + end + end + end + + describe '#stopped?' do + subject { deployment.stopped? } + + context 'when deployment starts an environment' do + context 'when the action was successful' do + let!(:deployment) { create(:deployment, :start, :success) } + + it { is_expected.to be_falsy } + end + + context 'when the action failed' do + let!(:deployment) { create(:deployment, :start, :failed) } + + it { is_expected.to be_falsy } + end + end + + context 'when deployment stops an environment' do + context 'when the action was successful' do + let!(:deployment) { create(:deployment, :stop, :success) } + + it { is_expected.to be_truthy } + end + + context 'when the action failed' do + let!(:deployment) { create(:deployment, :stop, :failed) } + + it { is_expected.to be_falsy } + end + end + end + describe '#deployed_at' do subject { deployment.deployed_at } diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb index e121369f6ac..0dfdf105905 100644 --- a/spec/models/environment_spec.rb +++ b/spec/models/environment_spec.rb @@ -53,6 +53,65 @@ describe Environment do end end + describe '.with_deployment' do + subject { described_class.with_deployment(sha) } + + let(:environment) { create(:environment) } + let(:sha) { RepoHelpers.sample_commit.id } + + context 'when deployment starts environment' do + context 'when deployment has the specified sha' do + let!(:deployment) { create(:deployment, :start, environment: environment, sha: sha) } + + it { is_expected.to eq([environment]) } + end + + context 'when deployment does not have the specified sha' do + let!(:deployment) { create(:deployment, :start, environment: environment, sha: 'abc') } + + it { is_expected.to be_empty } + end + end + + context 'when deployment stops environment' do + let!(:deployment) { create(:deployment, :stop, environment: environment) } + + it { is_expected.to be_empty } + end + end + + describe '#last_deployed_at' do + subject { environment.last_deployed_at } + + let(:environment) { create(:environment) } + + context 'when the latest deployment is for starting an environment' do + context 'when the latest deployment is successful' do + let!(:deployment) { create(:deployment, :start, :success, environment: environment) } + + it { expect(subject.to_i).to eq(deployment.finished_at.to_i) } + end + + context 'when the latest deployment failed' do + let!(:deployment) { create(:deployment, :start, :failed, environment: environment) } + + it { is_expected.to be_nil } + end + + context 'when the latest deployment is running' do + let!(:deployment) { create(:deployment, :start, :running, environment: environment) } + + it { is_expected.to be_nil } + end + end + + context 'when the latest deployment is for stopping environment' do + let!(:deployment) { create(:deployment, :stop, :success, environment: environment) } + + it { is_expected.to be_nil } + end + end + describe '#folder_name' do context 'when it is inside a folder' do subject(:environment) do @@ -134,26 +193,6 @@ describe Environment do end end - describe '#first_deployment_for' do - let(:project) { create(:project, :repository) } - let!(:deployment) { create(:deployment, :succeed, environment: environment, ref: commit.parent.id) } - let!(:deployment1) { create(:deployment, :succeed, environment: environment, ref: commit.id) } - let(:head_commit) { project.commit } - let(:commit) { project.commit.parent } - - it 'returns deployment id for the environment' do - expect(environment.first_deployment_for(commit.id)).to eq deployment1 - end - - it 'return nil when no deployment is found' do - expect(environment.first_deployment_for(head_commit.id)).to eq nil - end - - it 'returns a UTF-8 ref' do - expect(environment.first_deployment_for(commit.id).ref).to be_utf8 - end - end - describe '#environment_type' do subject { environment.environment_type } diff --git a/spec/models/environment_status_spec.rb b/spec/models/environment_status_spec.rb index 52b98552184..f9578da5032 100644 --- a/spec/models/environment_status_spec.rb +++ b/spec/models/environment_status_spec.rb @@ -1,8 +1,10 @@ require 'spec_helper' describe EnvironmentStatus do - let(:deployment) { create(:deployment, :succeed, :review_app) } - let(:environment) { deployment.environment} + include ProjectForksHelper + + let(:deployment) { create(:deployment, :succeed, :start, :review_app) } + let(:environment) { deployment.environment } let(:project) { deployment.project } let(:merge_request) { create(:merge_request, :deployed_review_app, deployment: deployment) } let(:sha) { deployment.sha } @@ -65,9 +67,9 @@ describe EnvironmentStatus do let(:admin) { create(:admin) } let(:pipeline) { create(:ci_pipeline, sha: sha) } - it 'is based on merge_request.head_pipeline' do - expect(merge_request).to receive(:head_pipeline).and_return(pipeline) - expect(merge_request).not_to receive(:merge_pipeline) + it 'is based on merge_request.diff_head_sha' do + expect(merge_request).to receive(:diff_head_sha) + expect(merge_request).not_to receive(:merge_commit_sha) described_class.for_merge_request(merge_request, admin) end @@ -81,11 +83,74 @@ describe EnvironmentStatus do merge_request.mark_as_merged! end - it 'is based on merge_request.merge_pipeline' do - expect(merge_request).to receive(:merge_pipeline).and_return(pipeline) - expect(merge_request).not_to receive(:head_pipeline) + it 'is based on merge_request.merge_commit_sha' do + expect(merge_request).to receive(:merge_commit_sha) + expect(merge_request).not_to receive(:diff_head_sha) described_class.after_merge_request(merge_request, admin) end end + + describe '.build_environments_status' do + subject { described_class.send(:build_environments_status, merge_request, user, sha) } + + let!(:build) { create(:ci_build, :deploy_to_production, pipeline: pipeline) } + let(:environment) { build.deployment.environment } + let(:user) { project.owner } + + before do + build.deployment.update(sha: sha) + end + + context 'when environment is created on a forked project' do + let(:project) { create(:project, :repository) } + let(:forked) { fork_project(project, user, repository: true) } + let(:sha) { forked.commit.sha } + let(:pipeline) { create(:ci_pipeline, sha: sha, project: forked) } + + let(:merge_request) do + create(:merge_request, source_project: forked, target_project: project, target_branch: 'master', head_pipeline: pipeline) + end + + it 'returns environment status' do + expect(subject.count).to eq(1) + expect(subject[0].environment).to eq(environment) + expect(subject[0].merge_request).to eq(merge_request) + expect(subject[0].sha).to eq(sha) + end + end + + context 'when environment is created on a target project' do + let(:project) { create(:project, :repository) } + let(:sha) { project.commit.sha } + let(:pipeline) { create(:ci_pipeline, sha: sha, project: project) } + + let(:merge_request) do + create(:merge_request, source_project: project, source_branch: 'feature', target_project: project, target_branch: 'master', head_pipeline: pipeline) + end + + it 'returns environment status' do + expect(subject.count).to eq(1) + expect(subject[0].environment).to eq(environment) + expect(subject[0].merge_request).to eq(merge_request) + expect(subject[0].sha).to eq(sha) + end + + context 'when the build stops an environment' do + let!(:build) { create(:ci_build, :stop_review_app, pipeline: pipeline) } + + it 'does not return environment status' do + expect(subject.count).to eq(0) + end + end + + context 'when user does not have a permission to see the environment' do + let(:user) { create(:user) } + + it 'does not return environment status' do + expect(subject.count).to eq(0) + end + end + end + end end diff --git a/spec/serializers/environment_status_entity_spec.rb b/spec/serializers/environment_status_entity_spec.rb index 962ec919092..52bd40ecb5e 100644 --- a/spec/serializers/environment_status_entity_spec.rb +++ b/spec/serializers/environment_status_entity_spec.rb @@ -15,6 +15,7 @@ describe EnvironmentStatusEntity do subject { entity.as_json } before do + deployment.update(sha: merge_request.diff_head_sha) allow(request).to receive(:current_user).and_return(user) end diff --git a/spec/services/update_deployment_service_spec.rb b/spec/services/start_environment_service_spec.rb index 3c55dd9659a..105d69c6b8e 100644 --- a/spec/services/update_deployment_service_spec.rb +++ b/spec/services/start_environment_service_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe UpdateDeploymentService do +describe StartEnvironmentService do let(:user) { create(:user) } let(:options) { { name: 'production' } } @@ -84,8 +84,8 @@ describe UpdateDeploymentService do it 'updates external url' do subject - expect(subject.environment.name).to eq('review-apps/master') - expect(subject.environment.external_url).to eq('http://master.review-apps.gitlab.com') + expect(environment.reload.name).to eq('review-apps/master') + expect(environment.reload.external_url).to eq('http://master.review-apps.gitlab.com') end end end diff --git a/spec/services/stop_environment_service_spec.rb b/spec/services/stop_environment_service_spec.rb new file mode 100644 index 00000000000..c41e010d717 --- /dev/null +++ b/spec/services/stop_environment_service_spec.rb @@ -0,0 +1,43 @@ +require 'spec_helper' + +describe StopEnvironmentService do + let(:service) { described_class.new(deployment) } + + describe '#execute' do + subject { service.execute } + + context 'when environment is available' do + let(:environment) { create(:environment, state: :available) } + + context 'when deployment was successful' do + let(:deployment) { create(:deployment, :success, :stop, environment: environment) } + + it 'stops the environment' do + subject + + expect(environment.reload).to be_stopped + end + end + + context 'when deployment failed' do + let(:deployment) { create(:deployment, :failed, :stop, environment: environment) } + + it 'does not stop the environment' do + subject + + expect(environment.reload).to be_available + end + end + end + + context 'when environment is stopped' do + let(:deployment) { create(:deployment, :success, :stop, environment: environment) } + let(:environment) { create(:environment, state: :stopped) } + + it 'does not raise an error' do + expect { subject }.not_to raise_error + expect(environment.reload).to be_stopped + end + end + end +end diff --git a/spec/workers/build_success_worker_spec.rb b/spec/workers/build_success_worker_spec.rb index 5eb9709ded9..8e9b178728e 100644 --- a/spec/workers/build_success_worker_spec.rb +++ b/spec/workers/build_success_worker_spec.rb @@ -47,19 +47,6 @@ describe BuildSuccessWorker do 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) } - - it 'stops the environment' do - expect(environment).to be_available - - subject - - expect(environment.reload).to be_stopped - end - end end context 'when build does not exist' do diff --git a/spec/workers/deployments/success_worker_spec.rb b/spec/workers/deployments/success_worker_spec.rb index ba7d45eca01..57aaa929a37 100644 --- a/spec/workers/deployments/success_worker_spec.rb +++ b/spec/workers/deployments/success_worker_spec.rb @@ -3,34 +3,51 @@ require 'spec_helper' describe Deployments::SuccessWorker do subject { described_class.new.perform(deployment&.id) } - context 'when successful deployment' do - let(:deployment) { create(:deployment, :success) } + context 'when deployment starts environment' do + context 'when deployment was successful' do + let(:deployment) { create(:deployment, :start, :success) } - it 'executes UpdateDeploymentService' do - expect(UpdateDeploymentService) - .to receive(:new).with(deployment).and_call_original + it 'executes StartEnvironmentService' do + expect(StartEnvironmentService) + .to receive(:new).with(deployment).and_call_original - subject + subject + end end - end - context 'when canceled deployment' do - let(:deployment) { create(:deployment, :canceled) } + context 'when deployment failed' do + let(:deployment) { create(:deployment, :start, :failed) } - it 'does not execute UpdateDeploymentService' do - expect(UpdateDeploymentService).not_to receive(:new) + it 'does not execute StartEnvironmentService' do + expect(StartEnvironmentService) + .not_to receive(:new).with(deployment).and_call_original - subject + subject + end end end - context 'when deploy record does not exist' do - let(:deployment) { nil } + context 'when deployment stops environment' do + context 'when deployment was successful' do + let(:deployment) { create(:deployment, :stop, :success) } + + it 'executes StopEnvironmentService' do + expect(StopEnvironmentService) + .to receive(:new).with(deployment).and_call_original + + subject + end + end + + context 'when deployment failed' do + let(:deployment) { create(:deployment, :stop, :failed) } - it 'does not execute UpdateDeploymentService' do - expect(UpdateDeploymentService).not_to receive(:new) + it 'does not execute StopEnvironmentService' do + expect(StopEnvironmentService) + .not_to receive(:new).with(deployment).and_call_original - subject + subject + end end end end |