shipit-engine 0.26.0 → 0.27.0

data/test/models/deploys_test.rb

@@ -467,16 +467,18 @@ module Shipit
     end
 
     test "triggering a deploy sets the release status as pending" do
-      @commit = shipit_commits(:fifth)
+      @commit = shipit_commits(:canaries_fifth)
+      @stack = @commit.stack
+
       assert_difference -> { ReleaseStatus.count }, +1 do
         assert_equal 'unknown', @commit.last_release_status.state
-        @deploy = @stack.trigger_deploy(@commit, AnonymousUser.new)
+        @deploy = @stack.trigger_deploy(@commit, AnonymousUser.new, force: true)
         assert_equal 'pending', @commit.last_release_status.state
       end
     end
 
     test "failing a deploy sets the release status as error" do
-      @deploy = shipit_deploys(:shipit_running)
+      @deploy = shipit_deploys(:canaries_running)
       assert_difference -> { ReleaseStatus.count }, +1 do
         assert_not_equal 'error', @deploy.last_release_status.state
         @deploy.report_failure!(StandardError.new)
@@ -485,8 +487,8 @@ module Shipit
     end
 
     test "succeeding a deploy sets the release status as success if the status delay is 0s" do
-      @deploy = shipit_deploys(:shipit_running)
-      @deploy.stack.expects(:release_status_delay).returns(Duration.parse(0))
+      @deploy = shipit_deploys(:canaries_running)
+      @deploy.stack.expects(:release_status_delay).at_least_once.returns(Duration.parse(0))
 
       assert_difference -> { ReleaseStatus.count }, +1 do
         assert_not_equal 'success', @deploy.last_release_status.state
@@ -496,25 +498,49 @@ module Shipit
     end
 
     test "succeeding a deploy sets the release status as pending if the status delay is longer than 0s" do
-      @deploy = shipit_deploys(:shipit_running)
-      @deploy.stack.expects(:release_status_delay).returns(Duration.parse(1))
+      @deploy = shipit_deploys(:canaries_running)
+      @deploy.stack.expects(:release_status_delay).at_least_once.returns(Duration.parse(1))
 
       assert_difference -> { ReleaseStatus.count }, +1 do
         assert_not_equal 'success', @deploy.last_release_status.state
-        assert_enqueued_with(job: AppendDelayedReleaseStatusJob) do
-          @deploy.complete!
+        assert_enqueued_with(job: MarkDeployHealthyJob) do
+          @deploy.report_complete!
+          assert_equal 'validating', @deploy.status
         end
         assert_equal 'pending', @deploy.last_release_status.state
       end
     end
 
-    test "triggering a rollback sets the release status as failure" do
-      @deploy = shipit_deploys(:shipit_complete)
+    test "triggering a rollback via abort! sets the release status as failure" do
+      @deploy = shipit_deploys(:canaries_running)
+      @deploy.ping
 
-      assert_difference -> { ReleaseStatus.count }, +1 do
+      assert_difference -> { ReleaseStatus.count }, +3 do
+        assert_equal 'running', @deploy.status
         assert_not_equal 'failure', @deploy.last_release_status.state
-        @deploy.trigger_rollback
-        assert_equal 'failure', @deploy.reload.last_release_status.state
+
+        @deploy.abort!(rollback_once_aborted: true, aborted_by: shipit_users(:walrus))
+
+        @deploy.reload
+        assert_equal 'aborting', @deploy.status
+        assert_equal 'failure', @deploy.last_release_status.state
+
+        @deploy.aborted!
+
+        @deploy.reload
+        assert_equal 'aborted', @deploy.status
+        assert_equal 'failure', @deploy.last_release_status.state
+      end
+    end
+
+    test "manually triggered rollbacks sets the release status as failure on the previously deployed revision" do
+      @deploy = shipit_deploys(:canaries_faulty)
+      last_deployed_commit = @deploy.stack.last_deployed_commit
+
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        assert_not_equal 'failure', last_deployed_commit.release_statuses.last&.state
+        @deploy.trigger_rollback(force: true)
+        assert_equal 'failure', last_deployed_commit.release_statuses.last.state
       end
     end
 

data/test/models/pull_request_test.rb

@@ -225,10 +225,10 @@ module Shipit
         @pr.reject!('merge_conflict')
       end
       params = job.arguments.first
-      assert_equal 'merge', params['event']
-      assert_json 'status', 'rejected', document: params['payload']
-      assert_json 'pull_request.rejection_reason', 'merge_conflict', document: params['payload']
-      assert_json 'pull_request.number', @pr.number, document: params['payload']
+      assert_equal 'merge', params[:event]
+      assert_json 'status', 'rejected', document: params[:payload]
+      assert_json 'pull_request.rejection_reason', 'merge_conflict', document: params[:payload]
+      assert_json 'pull_request.number', @pr.number, document: params[:payload]
     end
 
     test "#merge! doesnt delete the branch if there are open PRs against it" do

data/test/models/release_statuses_test.rb

@@ -5,9 +5,9 @@ module Shipit
     test "#create_status_on_github! calls GitHub API" do
       Shipit.github.api.expects(:create_status).once.with(
         'shopify/shipit-engine',
-        shipit_commits(:fourth).sha,
+        shipit_commits(:canaries_fourth).sha,
         'pending',
-        context: 'shipit/production',
+        context: 'shipit/canaries',
         target_url: 'https://example.com/deploys/42',
         description: 'Deploy started',
       ).returns(resource(id: 42))

data/test/models/stacks_test.rb

@@ -524,6 +524,30 @@ module Shipit
       end
     end
 
+    test "#trigger_continuous_delivery bails out if the previous deploy is still validating" do
+      @stack = shipit_stacks(:shipit_canaries)
+      shipit_tasks(:canaries_running).delete
+
+      assert_predicate @stack, :deployable?
+      assert_predicate @stack, :deployed_too_recently?
+      assert_predicate @stack.last_active_task, :validating?
+
+      assert_no_enqueued_jobs(only: Shipit::PerformTaskJob) do
+        assert_no_difference -> { Deploy.count } do
+          @stack.trigger_continuous_delivery
+        end
+      end
+
+      @stack.last_active_task.complete!
+      refute_predicate @stack, :deployed_too_recently?
+
+      assert_enqueued_with(job: Shipit::PerformTaskJob) do
+        assert_difference -> { Deploy.count }, +1 do
+          @stack.trigger_continuous_delivery
+        end
+      end
+    end
+
     test "#trigger_continuous_delivery trigger a deploy if all conditions are met" do
       @stack.tasks.delete_all
       assert_predicate @stack, :deployable?
@@ -541,6 +565,16 @@ module Shipit
       assert_equal({'SAFETY_DISABLED' => '0'}, deploy.env)
     end
 
+    test "#continuous_delivery_delayed! bumps updated_at" do
+      old_updated_at = @stack.updated_at - 3.minutes
+      @stack.update_column(:updated_at, old_updated_at)
+      @stack.reload
+
+      @stack.continuous_delivery_delayed!
+
+      assert_not_equal old_updated_at, @stack.updated_at
+    end
+
     test "#next_commit_to_deploy returns the last deployable commit" do
       @stack.tasks.where.not(until_commit_id: shipit_commits(:second).id).destroy_all
       assert_equal shipit_commits(:second), @stack.last_deployed_commit
@@ -611,5 +645,29 @@ module Shipit
       @stack.deploy_url = "ssh://abc"
       assert_predicate @stack, :valid?
     end
+
+    test "#ci_enabled? is true if there are any commits with a status" do
+      Shipit::CheckRun.where(stack_id: @stack.id).delete_all
+      Rails.cache.clear
+
+      assert_predicate Shipit::Status.where(stack_id: @stack.id), :any?
+      assert @stack.ci_enabled?
+    end
+
+    test "#ci_enabled? is true if there are any check runs" do
+      Shipit::Status.where(stack_id: @stack.id).delete_all
+      Rails.cache.clear
+
+      assert_predicate Shipit::CheckRun.where(stack_id: @stack.id), :any?
+      assert_predicate @stack, :ci_enabled?
+    end
+
+    test "#ci_enabled? is false if there are no check_runs or statuses" do
+      Shipit::Status.where(stack_id: @stack.id).delete_all
+      Shipit::CheckRun.where(stack_id: @stack.id).delete_all
+
+      Rails.cache.clear
+      refute_predicate @stack, :ci_enabled?
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: rails-timeago
   requirement: !ruby/object:Gem::Requirement
@@ -412,6 +412,7 @@ files:
 - app/assets/images/error.svg
 - app/assets/images/failure-small.svg
 - app/assets/images/failure.svg
+- app/assets/images/faulty.svg
 - app/assets/images/favicon.ico
 - app/assets/images/flapping.svg
 - app/assets/images/lock.svg
@@ -425,6 +426,7 @@ files:
 - app/assets/images/success.svg
 - app/assets/images/timedout.svg
 - app/assets/images/unknown.svg
+- app/assets/images/validating.svg
 - app/assets/images/validation/invalid.png
 - app/assets/images/validation/required.png
 - app/assets/images/validation/valid.png
@@ -503,7 +505,6 @@ files:
 - app/helpers/shipit/shipit_helper.rb
 - app/helpers/shipit/stacks_helper.rb
 - app/helpers/shipit/tasks_helper.rb
-- app/jobs/shipit/append_delayed_release_status_job.rb
 - app/jobs/shipit/background_job.rb
 - app/jobs/shipit/background_job/unique.rb
 - app/jobs/shipit/cache_deploy_spec_job.rb
@@ -520,6 +521,7 @@ files:
 - app/jobs/shipit/fetch_commit_stats_job.rb
 - app/jobs/shipit/fetch_deployed_revision_job.rb
 - app/jobs/shipit/github_sync_job.rb
+- app/jobs/shipit/mark_deploy_healty_job.rb
 - app/jobs/shipit/merge_pull_requests_job.rb
 - app/jobs/shipit/perform_commit_checks_job.rb
 - app/jobs/shipit/perform_task_job.rb
@@ -817,7 +819,6 @@ files:
 - test/helpers/links_helper.rb
 - test/helpers/payloads_helper.rb
 - test/helpers/queries_helper.rb
-- test/jobs/append_delayed_release_status_job_test.rb
 - test/jobs/cache_deploy_spec_job_test.rb
 - test/jobs/chunk_rollup_job_test.rb
 - test/jobs/deliver_hook_job_test.rb
@@ -826,6 +827,7 @@ files:
 - test/jobs/fetch_commit_stats_job_test.rb
 - test/jobs/fetch_deployed_revision_job_test.rb
 - test/jobs/github_sync_job_test.rb
+- test/jobs/mark_deploy_healthy_job_test.rb
 - test/jobs/merge_pull_requests_job_test.rb
 - test/jobs/perform_task_job_test.rb
 - test/jobs/purge_old_deliveries_job_test.rb
@@ -896,151 +898,151 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Application deployment software
 test_files:
-- test/controllers/release_statuses_controller_test.rb
-- test/controllers/status_controller_test.rb
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
+- test/dummy/public/422.html
+- test/dummy/public/404.html
+- test/dummy/db/seeds.rb
+- test/dummy/db/schema.rb
+- test/dummy/bin/rake
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/bin/setup
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/config.ru
+- test/dummy/Rakefile
+- test/dummy/config/application.rb
+- test/dummy/config/database.yml
+- test/dummy/config/locales/en.yml
+- test/dummy/config/secrets.yml
+- test/dummy/config/boot.rb
+- test/dummy/config/database.mysql.yml
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/0_load_development_secrets.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/database.postgresql.yml
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/controllers/webhooks_controller_test.rb
+- test/controllers/rollbacks_controller_test.rb
 - test/controllers/github_authentication_controller_test.rb
-- test/controllers/pull_requests_controller_test.rb
-- test/controllers/tasks_controller_test.rb
-- test/controllers/commits_controller_test.rb
 - test/controllers/merge_status_controller_test.rb
-- test/controllers/webhooks_controller_test.rb
-- test/controllers/deploys_controller_test.rb
+- test/controllers/commit_checks_controller_test.rb
 - test/controllers/ccmenu_controller_test.rb
-- test/controllers/api/locks_controller_test.rb
-- test/controllers/api/base_controller_test.rb
-- test/controllers/api/outputs_controller_test.rb
-- test/controllers/api/pull_requests_controller_test.rb
-- test/controllers/api/tasks_controller_test.rb
+- test/controllers/stacks_controller_test.rb
+- test/controllers/deploys_controller_test.rb
 - test/controllers/api/hooks_controller_test.rb
-- test/controllers/api/commits_controller_test.rb
-- test/controllers/api/deploys_controller_test.rb
 - test/controllers/api/ccmenu_controller_test.rb
 - test/controllers/api/stacks_controller_test.rb
-- test/controllers/rollbacks_controller_test.rb
-- test/controllers/commit_checks_controller_test.rb
-- test/controllers/stacks_controller_test.rb
-- test/unit/csv_serializer_test.rb
-- test/unit/variable_definition_test.rb
+- test/controllers/api/base_controller_test.rb
+- test/controllers/api/locks_controller_test.rb
+- test/controllers/api/deploys_controller_test.rb
+- test/controllers/api/commits_controller_test.rb
+- test/controllers/api/pull_requests_controller_test.rb
+- test/controllers/api/tasks_controller_test.rb
+- test/controllers/api/outputs_controller_test.rb
+- test/controllers/status_controller_test.rb
+- test/controllers/commits_controller_test.rb
+- test/controllers/release_statuses_controller_test.rb
+- test/controllers/pull_requests_controller_test.rb
+- test/controllers/tasks_controller_test.rb
+- test/unit/command_test.rb
 - test/unit/commands_test.rb
+- test/unit/deploy_commands_test.rb
 - test/unit/shipit_test.rb
-- test/unit/command_test.rb
-- test/unit/environment_variables_test.rb
+- test/unit/rollback_commands_test.rb
+- test/unit/csv_serializer_test.rb
+- test/unit/variable_definition_test.rb
 - test/unit/github_url_helper_test.rb
+- test/unit/environment_variables_test.rb
 - test/unit/github_app_test.rb
-- test/unit/deploy_commands_test.rb
-- test/unit/rollback_commands_test.rb
-- test/test_helper.rb
-- test/jobs/refresh_status_job_test.rb
-- test/jobs/chunk_rollup_job_test.rb
-- test/jobs/deliver_hook_job_test.rb
-- test/jobs/emit_event_job_test.rb
-- test/jobs/perform_task_job_test.rb
-- test/jobs/destroy_stack_job_test.rb
-- test/jobs/purge_old_deliveries_job_test.rb
-- test/jobs/github_sync_job_test.rb
-- test/jobs/unique_job_test.rb
-- test/jobs/refresh_github_user_job_test.rb
-- test/jobs/merge_pull_requests_job_test.rb
-- test/jobs/fetch_deployed_revision_job_test.rb
-- test/jobs/fetch_commit_stats_job_test.rb
-- test/jobs/append_delayed_release_status_job_test.rb
-- test/jobs/cache_deploy_spec_job_test.rb
-- test/models/status/missing_test.rb
-- test/models/status/group_test.rb
-- test/models/tasks_test.rb
-- test/models/github_hook_test.rb
-- test/models/duration_test.rb
-- test/models/output_chunk_test.rb
-- test/models/task_definitions_test.rb
-- test/models/team_test.rb
 - test/models/release_statuses_test.rb
-- test/models/commits_test.rb
-- test/models/commit_deployment_test.rb
-- test/models/deploy_spec_test.rb
-- test/models/commit_deployment_status_test.rb
-- test/models/api_client_test.rb
-- test/models/membership_test.rb
+- test/models/deploys_test.rb
 - test/models/undeployed_commits_test.rb
+- test/models/team_test.rb
+- test/models/rollbacks_test.rb
 - test/models/commit_checks_test.rb
+- test/models/github_hook_test.rb
+- test/models/task_definitions_test.rb
+- test/models/tasks_test.rb
+- test/models/output_chunk_test.rb
+- test/models/commit_deployment_status_test.rb
 - test/models/delivery_test.rb
-- test/models/status_test.rb
+- test/models/users_test.rb
+- test/models/commit_deployment_test.rb
+- test/models/duration_test.rb
+- test/models/api_client_test.rb
+- test/models/shipit/check_run_test.rb
+- test/models/commits_test.rb
+- test/models/status/group_test.rb
+- test/models/status/missing_test.rb
+- test/models/deploy_spec_test.rb
 - test/models/stacks_test.rb
-- test/models/deploys_test.rb
 - test/models/hook_test.rb
-- test/models/shipit/check_run_test.rb
+- test/models/membership_test.rb
+- test/models/status_test.rb
 - test/models/pull_request_test.rb
-- test/models/users_test.rb
-- test/models/rollbacks_test.rb
-- test/helpers/fixture_aliases_helper.rb
+- test/test_command_integration.rb
+- test/helpers/hooks_helper.rb
 - test/helpers/queries_helper.rb
-- test/helpers/api_helper.rb
+- test/helpers/json_helper.rb
+- test/helpers/fixture_aliases_helper.rb
 - test/helpers/payloads_helper.rb
 - test/helpers/links_helper.rb
-- test/helpers/hooks_helper.rb
-- test/helpers/json_helper.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/bin/rails
-- test/dummy/bin/setup
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/0_load_development_secrets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config/database.mysql.yml
-- test/dummy/config/application.rb
-- test/dummy/config/database.postgresql.yml
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/routes.rb
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/422.html
-- test/dummy/public/404.html
-- test/dummy/db/schema.rb
-- test/dummy/db/seeds.rb
-- test/dummy/Rakefile
-- test/dummy/config.ru
-- test/test_command_integration.rb
-- test/fixtures/payloads/push_not_master.json
-- test/fixtures/payloads/check_suite_master.json
-- test/fixtures/payloads/push_master.json
-- test/fixtures/payloads/status_master.json
+- test/helpers/api_helper.rb
+- test/jobs/emit_event_job_test.rb
+- test/jobs/unique_job_test.rb
+- test/jobs/merge_pull_requests_job_test.rb
+- test/jobs/deliver_hook_job_test.rb
+- test/jobs/refresh_status_job_test.rb
+- test/jobs/fetch_deployed_revision_job_test.rb
+- test/jobs/purge_old_deliveries_job_test.rb
+- test/jobs/refresh_github_user_job_test.rb
+- test/jobs/chunk_rollup_job_test.rb
+- test/jobs/mark_deploy_healthy_job_test.rb
+- test/jobs/fetch_commit_stats_job_test.rb
+- test/jobs/cache_deploy_spec_job_test.rb
+- test/jobs/perform_task_job_test.rb
+- test/jobs/github_sync_job_test.rb
+- test/jobs/destroy_stack_job_test.rb
 - test/fixtures/timeout
-- test/fixtures/shipit/memberships.yml
 - test/fixtures/shipit/check_runs.yml
-- test/fixtures/shipit/tasks.yml
+- test/fixtures/shipit/release_statuses.yml
 - test/fixtures/shipit/users.yml
-- test/fixtures/shipit/statuses.yml
+- test/fixtures/shipit/output_chunks.yml
 - test/fixtures/shipit/deliveries.yml
-- test/fixtures/shipit/stacks.yml
-- test/fixtures/shipit/pull_requests.yml
-- test/fixtures/shipit/teams.yml
-- test/fixtures/shipit/github_hooks.yml
 - test/fixtures/shipit/hooks.yml
-- test/fixtures/shipit/release_statuses.yml
-- test/fixtures/shipit/commit_deployment_statuses.yml
+- test/fixtures/shipit/github_hooks.yml
+- test/fixtures/shipit/statuses.yml
+- test/fixtures/shipit/memberships.yml
+- test/fixtures/shipit/teams.yml
+- test/fixtures/shipit/tasks.yml
+- test/fixtures/shipit/api_clients.yml
+- test/fixtures/shipit/stacks.yml
 - test/fixtures/shipit/commits.yml
+- test/fixtures/shipit/pull_requests.yml
 - test/fixtures/shipit/commit_deployments.yml
-- test/fixtures/shipit/api_clients.yml
-- test/fixtures/shipit/output_chunks.yml
+- test/fixtures/shipit/commit_deployment_statuses.yml
+- test/fixtures/payloads/status_master.json
+- test/fixtures/payloads/push_master.json
+- test/fixtures/payloads/push_not_master.json
+- test/fixtures/payloads/check_suite_master.json
+- test/test_helper.rb