shipit-engine 0.11.0 → 0.12.0

data/test/dummy/data/stacks/byroot/junk/production/git/bar.txt

@@ -0,0 +1,2 @@
+foo
+sadsadasd

data/test/dummy/data/stacks/byroot/junk/production/git/bin/slow

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for i in `seq 1 5`;
+do
+        echo $i
+        sleep 1
+done

data/test/dummy/data/stacks/byroot/junk/production/git/bin/timeout

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+
+trap "{ echo 'got killed, exiting' ; exit 255; }" SIGINT SIGTERM
+
+echo "will sleep forever\n"
+while true; do 
+  sleep 20
+done
+echo done

data/test/dummy/data/stacks/byroot/junk/production/git/sdkfjsdf

@@ -0,0 +1 @@
+dslkfnds

data/test/dummy/data/stacks/byroot/junk/production/git/shipit.yml

@@ -0,0 +1,21 @@
+review:
+  checklist:
+    - Blah Blah
+  checks:
+    - echo 42
+
+deploy:
+  override:
+    - bin/slow
+    - bin/timeout: {timeout: 5}
+
+rollback:
+  override:
+    - echo done
+
+tasks:
+  restart:
+    action: Restart application
+    description: Trigger the restart of both app and jobs servers
+    steps:
+      - cap $ENVIRONMENT deploy:restart

data/test/dummy/data/stacks/byroot/junk/production/git/toto.txt

@@ -0,0 +1,2 @@
+A
+A

data/test/dummy/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: 20160526192650) do
+ActiveRecord::Schema.define(version: 20160822131405) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text     "permissions", limit: 65535
@@ -130,22 +130,24 @@ ActiveRecord::Schema.define(version: 20160526192650) do
   add_index "output_chunks", ["task_id"], name: "index_output_chunks_on_task_id"
 
   create_table "stacks", force: :cascade do |t|
-    t.string   "repo_name",                 limit: 100,                          null: false
-    t.string   "repo_owner",                limit: 39,                           null: false
-    t.string   "environment",               limit: 50,    default: "production", null: false
+    t.string   "repo_name",                         limit: 100,                          null: false
+    t.string   "repo_owner",                        limit: 39,                           null: false
+    t.string   "environment",                       limit: 50,    default: "production", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "branch",                    limit: 255,   default: "master",     null: false
-    t.string   "deploy_url",                limit: 255
-    t.string   "lock_reason",               limit: 4096
-    t.integer  "tasks_count",               limit: 4,     default: 0,            null: false
-    t.boolean  "continuous_deployment",                   default: false,        null: false
-    t.integer  "undeployed_commits_count",  limit: 4,     default: 0,            null: false
-    t.text     "cached_deploy_spec",        limit: 65535
-    t.integer  "lock_author_id",            limit: 4
+    t.string   "branch",                            limit: 255,   default: "master",     null: false
+    t.string   "deploy_url",                        limit: 255
+    t.string   "lock_reason",                       limit: 4096
+    t.integer  "tasks_count",                       limit: 4,     default: 0,            null: false
+    t.boolean  "continuous_deployment",                           default: false,        null: false
+    t.integer  "undeployed_commits_count",          limit: 4,     default: 0,            null: false
+    t.text     "cached_deploy_spec",                limit: 65535
+    t.integer  "lock_author_id",                    limit: 4
     t.boolean  "ignore_ci"
     t.datetime "inaccessible_since"
-    t.integer  "estimated_deploy_duration",               default: 1,            null: false
+    t.integer  "estimated_deploy_duration",                       default: 1,            null: false
+    t.datetime "continuous_delivery_delayed_since"
+    t.datetime "locked_since"
   end
 
   add_index "stacks", ["repo_owner", "repo_name", "environment"], name: "stack_unicity", unique: true

data/test/fixtures/shipit/commit_deployments.yml

@@ -1,37 +1,37 @@
 shipit_deploy_second:
   commit_id: 2 # second
-  task: shipit
+  task_id: 1 # shipit
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/1
   github_id: 1
 
 shipit2_deploy_third:
   commit_id: 3 # third
-  task: shipit2
+  task_id: 2 # shipit2
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/2
   github_id: 2
 
 shipit_pending_third:
   commit_id: 3 # third
-  task: shipit_pending
+  task_id: 4 # shipit_pending
   api_url: https://api.github.com/repos/shopify/shipit-engine/deployments/3
   github_id: 3
 
 shipit_pending_fourth:
   commit_id: 4 # fourth
-  task: shipit_pending
+  task_id: 4 # shipit_pending
 
 shipit_running_fourth:
   commit_id: 4 # fourth
-  task: shipit_running
+  task_id: 5 # shipit_running
 
 shipit_complete_fourth:
   commit_id: 4 # fourth
-  task: shipit_complete
+  task_id: 6 # shipit_complete
 
 shipit_aborted_fourth:
   commit_id: 4 # fourth
-  task: shipit_aborted
+  task_id: 7 # shipit_aborted
 
 shipit_rollback_fourth:
   commit_id: 4 # fourth
-  task: shipit_rollback
+  task_id: 8 # shipit_rollback

data/test/fixtures/shipit/output_chunks.yml

@@ -1,47 +1,47 @@
 shipit:
-  task: shipit
+  task_id: 1 # shipit
   text: "deploy deploy deploy, faiiil"
 
 shipit2:
-  task: shipit
+  task_id: 1 # shipit
   text: "Migrating some stuff"
 
 shipit3:
-  task: shipit
+  task_id: 1 # shipit
   text: "Compiling all the sass"
 
 shipit4:
-  task: shipit
+  task_id: 1 # shipit
   text: "Making ops cry"
 
 shipit5:
-  task: shipit
+  task_id: 1 # shipit
   text: "sudo rm -rf /"
 
 shipit6:
-  task: shipit
+  task_id: 1 # shipit
   text: "sudo chmod -R 777 /"
 
 shipit_running:
-  task: shipit_running
+  task_id: 5 # shipit_running
   text: "deploy deploy deploy, faiiil"
 
 shipit_running:
-  task: shipit_running
+  task_id: 5 # shipit_running
   text: "Migrating some stuff"
 
 shipit_running3:
-  task: shipit_running
+  task_id: 5 # shipit_running
   text: "Compiling all the sass"
 
 shipit_running4:
-  task: shipit_running
+  task_id: 5 # shipit_running
   text: "Making ops cry"
 
 shipit_running5:
-  task: shipit_running
+  task_id: 5 # shipit_running
   text: "sudo rm -rf /"
 
 shipit_running6:
-  task: shipit_running
+  task_id: 5 # shipit_running
   text: "sudo chmod -R 777 /"

data/test/fixtures/shipit/tasks.yml

@@ -1,4 +1,5 @@
 shipit:
+  id: 1
   user: walrus
   since_commit_id: 1 # first
   until_commit_id: 2 # second
@@ -12,6 +13,7 @@ shipit:
   ended_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
 
 shipit2:
+  id: 2
   user: walrus
   since_commit_id: 2 # second
   until_commit_id: 3 # third
@@ -25,6 +27,7 @@ shipit2:
   ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
 
 shipit_restart:
+  id: 3
   user: walrus
   since_commit_id: 2 # second
   until_commit_id: 2 # second
@@ -49,6 +52,7 @@ shipit_restart:
   ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
 
 shipit_pending:
+  id: 4
   since_commit_id: 2 # second
   until_commit_id: 4 # fourth
   type: Shipit::Deploy
@@ -59,6 +63,7 @@ shipit_pending:
   created_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
 
 shipit_running:
+  id: 5
   user: walrus
   since_commit_id: 3
   until_commit_id: 4
@@ -71,6 +76,7 @@ shipit_running:
   started_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
 
 shipit_complete:
+  id: 6
   user: bob
   since_commit_id: 3
   until_commit_id: 4
@@ -84,6 +90,7 @@ shipit_complete:
   ended_at: <%= (60 - 8).minutes.ago.to_s(:db) %>
 
 shipit_aborted:
+  id: 7
   user: bob
   since_commit_id: 3
   until_commit_id: 4
@@ -98,8 +105,9 @@ shipit_aborted:
   ended_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
 
 shipit_rollback:
+  id: 8
   user: bob
-  deploy: shipit_aborted
+  parent_id: 7 # shipit_aborted
   since_commit_id: 3
   until_commit_id: 4
   type: Shipit::Rollback

data/test/fixtures/shipit/users.yml

@@ -2,8 +2,8 @@ walrus:
   name:  Lando Walrussian
   email: walrus@shopify.com
   login: walrus
-  encrypted_github_access_token: FuQv9jpHmMZ8Px64xmqASJtKlefv # t0k3n
-  encrypted_github_access_token_iv: "QNS4smChXEXtOjxb\n"
+  encrypted_github_access_token: "ffHk4diyVKppJGfwfJefMizxF45H\n" # t0k3n
+  encrypted_github_access_token_iv: "gRSldoTZ+fmrIDoY\n"
 
 bob:
   name:  Bob the Builder
@@ -20,3 +20,10 @@ shipit:
   name: Shipit
   email: shipit@example.com
   login: shipit
+
+legacy:
+  name:  Legacy Walrussian
+  email: legacy@shopify.com
+  login: legacy
+  encrypted_github_access_token: FuQv9jpHmMZ8Px64xmqASJtKlefv # t0k3n
+  encrypted_github_access_token_iv: "QNS4smChXEXtOjxb\n"

data/test/jobs/perform_task_job_test.rb

@@ -9,10 +9,12 @@ module Shipit
     end
 
     test "#perform fetch commits from the API" do
+      @job.stubs(:capture!)
       @job.stubs(:capture)
       @commands = stub(:commands)
       Commands.expects(:for).with(@deploy).returns(@commands)
 
+      @commands.expects(:fetched?).once.returns(false)
       @commands.expects(:fetch).once
       @commands.expects(:clone).once
       @commands.expects(:checkout).with(@deploy.until_commit).once
@@ -27,7 +29,7 @@ module Shipit
     test "#perform enqueues a FetchDeployedRevisionJob" do
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
-      @job.stubs(:capture)
+      @job.stubs(:capture!)
 
       assert_enqueued_with(job: FetchDeployedRevisionJob, args: [@deploy.stack]) do
         @job.perform(@deploy)
@@ -37,14 +39,14 @@ module Shipit
     test "marks deploy as successful" do
       Dir.stubs(:chdir).yields
       DeployCommands.any_instance.expects(:perform).returns([])
-      @job.stubs(:capture)
+      @job.stubs(:capture!)
 
       @job.perform(@deploy)
       assert_equal 'success', @deploy.reload.status
     end
 
     test "marks deploy as `error` if any application error is raised" do
-      @job.expects(:capture).raises("some error")
+      @job.expects(:capture!).raises("some error")
       assert_nothing_raised do
         @job.perform(@deploy)
       end
@@ -53,30 +55,31 @@ module Shipit
     end
 
     test "marks deploy as `failed` if a command exit with an error code" do
-      @job.expects(:capture).raises(Command::Error.new('something'))
+      @job.expects(:capture!).at_least_once.raises(Command::Error.new('something'))
       @job.perform(@deploy)
       assert_equal 'failed', @deploy.reload.status
     end
 
     test "bail out if deploy is not pending" do
       @deploy.run!
-      @job.expects(:capture).never
+      @job.expects(:capture!).never
+      @job.expects(:capture!).never
       @job.perform(@deploy)
     end
 
     test "mark deploy as error if a command timeout" do
-      Command.any_instance.expects(:timed_out?).returns(true)
-      Command.any_instance.expects(:terminate!)
-      assert_nothing_raised do
-        @job.perform(@deploy)
-      end
+      Command.any_instance.expects(:stream!).at_least_once.raises(Command::TimedOut)
+
+      @job.perform(@deploy)
+
       assert_equal 'failed', @deploy.reload.status
       assert_includes @deploy.chunk_output, 'TimedOut'
     end
 
     test "records stack support for rollbacks and fetching deployed revision" do
-      @job.stubs(:capture)
+      @job.stubs(:capture!)
       @commands = stub(:commands)
+      @commands.stubs(:fetched?).returns([])
       @commands.stubs(:fetch).returns([])
       @commands.stubs(:clone).returns([])
       @commands.stubs(:checkout).returns([])

data/test/models/commits_test.rb

@@ -157,8 +157,13 @@ module Shipit
     end
 
     test "refresh_statuses! pull state from github" do
-      rels = {target: mock(href: 'http://example.com')}
-      status = mock(state: 'success', description: nil, context: 'default', rels: rels, created_at: 1.day.ago)
+      status = mock(
+        state: 'success',
+        description: nil,
+        context: 'default',
+        target_url: 'http://example.com',
+        created_at: 1.day.ago,
+      )
       Shipit.github_api.expects(:statuses).with(@stack.github_repo_name, @commit.sha).returns([status])
       assert_difference '@commit.statuses.count', 1 do
         @commit.refresh_statuses!
@@ -169,13 +174,14 @@ module Shipit
     test "#creating a commit update the undeployed_commits_count" do
       walrus = shipit_users(:walrus)
       assert_equal 1, @stack.undeployed_commits_count
-      @stack.commits.create(author: walrus,
-                            committer: walrus,
-                            sha: "ab12",
-                            authored_at: DateTime.now,
-                            committed_at: DateTime.now,
-                            message: "more fish!")
-
+      @stack.commits.create!(
+        author: walrus,
+        committer: walrus,
+        sha: "ab12",
+        authored_at: DateTime.now,
+        committed_at: DateTime.now,
+        message: "more fish!",
+      )
       @stack.reload
       assert_equal 2, @stack.undeployed_commits_count
     end
@@ -292,6 +298,7 @@ module Shipit
     end
 
     expected_webhook_transitions = { # we expect deployable_status to fire on these transitions, and not on any others
+      'unknown' => %w(pending success failure error),
       'pending' => %w(success failure error),
       'success' => %w(failure error),
       'failure' => %w(success),
@@ -299,7 +306,7 @@ module Shipit
     }
     expected_webhook_transitions.each do |initial_state, firing_states|
       initial_status_attributes = {state: initial_state, description: 'abc', context: 'ci/travis'}
-      expected_webhook_transitions.keys.each do |new_state|
+      (expected_webhook_transitions.keys - %w(unknown)).each do |new_state|
         should_fire = firing_states.include?(new_state)
         action = should_fire ? 'fires' : 'does not fire'
         test "#add_status #{action} for status from #{initial_state} to #{new_state}" do
@@ -308,11 +315,16 @@ module Shipit
           refute commit.stack.ignore_ci
           commit.statuses.destroy_all
           commit.reload
-          commit.statuses.create!(initial_status_attributes.merge(created_at: 10.days.ago.to_s(:db)))
+          unless initial_state == 'unknown'
+            commit.statuses.create!(initial_status_attributes.merge(created_at: 10.days.ago.to_s(:db)))
+          end
           assert_equal initial_state, commit.state
 
           expected_status_attributes = {state: new_state, description: initial_state, context: 'ci/travis'}
-          add_status = -> { commit.add_status(expected_status_attributes.merge(created_at: 1.day.ago.to_s(:db))) }
+          add_status = lambda do
+            attrs = expected_status_attributes.merge(created_at: 1.day.ago.to_s(:db))
+            commit.create_status_from_github!(OpenStruct.new(attrs))
+          end
           expect_hook_emit(commit, :commit_status, expected_status_attributes) do
             if should_fire
               expect_hook_emit(commit, :deployable_status, expected_status_attributes, &add_status)
@@ -329,7 +341,13 @@ module Shipit
       assert commit.stack.hooks.where(events: ['commit_status']).size >= 1
 
       expect_no_hook(:deployable_status) do
-        commit.add_status(state: 'failure', description: 'Sad', context: 'ci/hidden', created_at: 1.day.ago.to_s(:db))
+        github_status = OpenStruct.new(
+          state: 'failure',
+          description: 'Sad',
+          context: 'ci/hidden',
+          created_at: 1.day.ago.to_s(:db),
+        )
+        commit.create_status_from_github!(github_status)
       end
     end
 
@@ -338,12 +356,13 @@ module Shipit
       assert commit.stack.hooks.where(events: ['commit_status']).size >= 1
 
       expect_no_hook(:deployable_status) do
-        commit.add_status(
+        github_status = OpenStruct.new(
           state: 'failure',
           description: 'Sad',
           context: 'ci/ok_to_fail',
           created_at: 1.day.ago.to_s(:db),
         )
+        commit.create_status_from_github!(github_status)
       end
     end