shipit-engine 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22eb132c6bbb6e9af2fdfca03481022aa47ccbeb
-  data.tar.gz: 6415095a2772724f3b2ad364411ad3d5956039f4
+  metadata.gz: af8d2464cc17caa2786a2a0a9500583b5ed0c7f3
+  data.tar.gz: e00c5b97da7d17dfc23e449630f158e724a5910f
 SHA512:
-  metadata.gz: 2d5f6b17d2f1b9f4a52b4ed208524dd13f4ddddd8d178e0235eaeecd318c872ee29b480b87f5f905bfc9990274e82e1addca61feefa98aa373b09f03d245176a
-  data.tar.gz: d17ad59449f3a8a801689d991ff4092efe67c6c88ea83f51de1c70257fdf3c919ea0181d1d206099fea76550824602c65b85432cdf88e879c770d99954a5a709
+  metadata.gz: 4bff19eadd58b4c9e0bc84c7facd5aaf4dfdc85000c19e1ba50754b7d011a4133ad620e92fef5c6863709643a299c31ecdbcb94634fcd23a48ee137b1fc2fd48
+  data.tar.gz: 9a9ef4184bac10c36545cb0c14105d6c7600a1c528bfa087295542f7d3cf01c1f435ed748ee543bf0cd451bc2707662b85d757496eae2d138bcd0a72ba228c0b

data/app/jobs/shipit/perform_task_job.rb

@@ -24,6 +24,31 @@ module Shipit
       @task.report_failure!(error)
     rescue StandardError => error
       @task.report_error!(error)
+    rescue Exception => error
+      @task.report_error!(error)
+      raise
+    end
+
+    def abort!(signal: 'TERM')
+      pid = @task.pid
+      if pid
+        @task.write("$ kill #{pid}\n")
+        Process.kill(signal, pid)
+      else
+        @task.write("Can't abort, no recorded pid, WTF?\n")
+      end
+    rescue SystemCallError => error
+      @task.write("kill: (#{pid}) - #{error.message}\n")
+    end
+
+    def check_for_abort
+      @task.should_abort? do |times_killed|
+        if times_killed > 3
+          abort!(signal: 'KILL')
+        else
+          abort!
+        end
+      end
     end
 
     def perform_task
@@ -46,7 +71,10 @@ module Shipit
     end
 
     def capture(command)
-      command.start
+      command.start do
+        @task.ping
+        check_for_abort
+      end
       @task.write("$ #{command}\npid: #{command.pid}\n")
       @task.pid = command.pid
       command.stream! do |line|

data/app/models/shipit/task.rb

@@ -1,8 +1,11 @@
 module Shipit
   class Task < ActiveRecord::Base
+    PRESENCE_CHECK_TIMEOUT = 15
     ACTIVE_STATUSES = %w(pending running aborting).freeze
     COMPLETED_STATUSES = %w(success error failed flapping aborted).freeze
 
+    attr_accessor :pid
+
     belongs_to :deploy, foreign_key: :parent_id, required: false # required for fixtures
 
     belongs_to :user
@@ -177,27 +180,45 @@ module Shipit
       !pending? && !running? && !aborting?
     end
 
-    def pid
-      pid = Shipit.redis.get("task:#{id}:pid")
-      pid.presence && pid.to_i
+    def ping
+      Shipit.redis.set(status_key, 'alive', ex: PRESENCE_CHECK_TIMEOUT)
     end
 
-    def pid=(pid)
-      Shipit.redis.set("task:#{id}:pid", pid, ex: 1.hour.to_i)
+    def alive?
+      Shipit.redis.get(status_key) == 'alive'
     end
 
-    def abort!(rollback_once_aborted: false)
-      target_pid = pid
-      return write("\nAbort: failed, PID unknown\n") unless target_pid.present?
+    def report_dead!
+      write("ERROR: Background job hasn't reported back in #{PRESENCE_CHECK_TIMEOUT} seconds.")
+      error!
+    end
+
+    def should_abort?
+      @last_abort_count ||= 1
+      (@last_abort_count..Shipit.redis.get(abort_key).to_i).each do |count|
+        @last_abort_count = count + 1
+        yield count
+      end
+    end
+
+    def request_abort
+      Shipit.redis.pipelined do
+        Shipit.redis.incr(abort_key)
+        Shipit.redis.expire(abort_key, 1.month.to_i)
+      end
+    end
 
+    def abort!(rollback_once_aborted: false)
       update!(rollback_once_aborted: rollback_once_aborted)
-      aborting!
-      write("\nAbort: sending SIGTERM to pid #{target_pid}\n")
-      Process.kill('TERM', target_pid)
-    rescue Errno::ESRCH
-      write("\nAbort: PID #{target_pid} ESRCH: No such process\n")
-      aborted!
-      true
+
+      if alive?
+        aborting
+        request_abort
+      elsif aborting? || aborted?
+        aborted
+      elsif !finished?
+        report_dead!
+      end
     end
 
     def working_directory
@@ -217,5 +238,15 @@ module Shipit
     def hook_event
       self.class.name.demodulize.underscore.to_sym
     end
+
+    private
+
+    def status_key
+      "shipit:task:#{id}"
+    end
+
+    def abort_key
+      "#{status_key}:aborting"
+    end
   end
 end

data/app/views/shipit/commits/_commit_author.html.erb

@@ -1,7 +1,7 @@
-<div class="commit-author">
+<a href="<%= github_user_url(commit.author.login) %>" class="commit-author">
   <%= github_avatar(commit.author, size: 80, class: 'commit-author__avatar') %>
   <div class="commit-author__name">
     <span class="commit-author__name__real-name"><%= commit.author.name %></span>
     <span class="commit-author__name__username"><%= commit.author.login %></span>
   </div>
-</div>
+</a>

data/db/migrate/20160426155146_add_index_for_stack_active_task.rb

@@ -0,0 +1,5 @@
+class AddIndexForStackActiveTask < ActiveRecord::Migration
+  def change
+    add_index :tasks, [:status, :stack_id, :allow_concurrency], name: :index_active_tasks
+  end
+end

data/lib/shipit/command.rb

@@ -11,6 +11,7 @@ module Shipit
     Failed = Class.new(Error)
     NotFound = Class.new(Error)
     Denied = Class.new(Error)
+    TimedOut = Class.new(Error)
 
     attr_reader :out, :code, :chdir, :env, :args, :pid, :timeout
 
@@ -21,6 +22,14 @@ module Shipit
       @chdir = chdir.to_s
     end
 
+    def with_timeout(new_timeout)
+      old_timeout = timeout
+      @timeout = new_timeout
+      yield
+    ensure
+      @timeout = old_timeout
+    end
+
     def to_s
       @args.join(' ')
     end
@@ -70,8 +79,9 @@ module Shipit
       interpolate_environment_variables(@args)
     end
 
-    def start
+    def start(&block)
       return if @started
+      @control_block = block
       child_in = @out = @pid = nil
       FileUtils.mkdir_p(@chdir)
       with_full_path do
@@ -92,7 +102,7 @@ module Shipit
       start
       begin
         read_stream(@out, &block)
-      rescue Timeout::Error => error
+      rescue TimedOut => error
         @code = 'timeout'
         yield red("No output received in the last #{timeout} seconds.") + "\n"
         terminate!(&block)
@@ -115,28 +125,42 @@ module Shipit
       self
     end
 
+    def timed_out?
+      @last_output_at ||= Time.now.to_i
+      (@last_output_at + timeout) < Time.now.to_i
+    end
+
+    def touch_last_output_at
+      @last_output_at = Time.now.to_i
+    end
+
+    def yield_control
+      @control_block.call if @control_block
+    end
+
     def read_stream(io)
+      touch_last_output_at
       loop do
-        with_timeout do
-          yield io.readpartial(MAX_READ)
+        begin
+          yield_control
+          yield io.read_nonblock(MAX_READ)
+          touch_last_output_at
+        rescue IO::WaitReadable
+          raise TimedOut if timed_out?
+          IO.select([io], nil, nil, 1)
+          retry
         end
       end
     rescue EOFError
     end
 
-    def with_timeout(&block)
-      return yield unless timeout
-
-      Timeout.timeout(timeout, &block)
-    end
-
     def terminate!(&block)
-      kill_and_wait('INT', 5, &block)
-      kill_and_wait('INT', 2, &block)
-      kill_and_wait('TERM', 5, &block)
-      kill_and_wait('TERM', 2, &block)
-      kill('KILL', &block)
-    rescue Errno::ECHILD
+      kill_and_wait('INT', 5, &block) ||
+        kill_and_wait('INT', 2, &block) ||
+        kill_and_wait('TERM', 5, &block) ||
+        kill_and_wait('TERM', 2, &block) ||
+        kill('KILL', &block)
+    rescue Errno::ECHILD, Errno::ESRCH
       true # much success
     ensure
       begin
@@ -147,10 +171,13 @@ module Shipit
 
     def kill_and_wait(sig, wait, &block)
       kill(sig, &block)
-      Timeout.timeout(wait) do
-        read_stream(@out, &block)
+      begin
+        with_timeout(wait) do
+          read_stream(@out, &block)
+        end
+      rescue TimedOut, Errno::EIO # EIO is somewhat expected on Linux: http://stackoverflow.com/a/10306782
       end
-    rescue Timeout::Error, Errno::EIO # Somewhat expected on Linux: http://stackoverflow.com/a/10306782
+      Process.wait(@pid, Process::WNOHANG)
     end
 
     def kill(sig)

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/test/controllers/tasks_controller_test.rb

@@ -60,7 +60,7 @@ module Shipit
 
     test ":abort call abort! on the deploy" do
       @task = shipit_deploys(:shipit_running)
-      @task.pid = 42
+      @task.ping
       post :abort, stack_id: @stack.to_param, id: @task.id
 
       @task.reload
@@ -71,7 +71,7 @@ module Shipit
 
     test ":abort schedule the rollback if `rollback` is present" do
       @task = shipit_deploys(:shipit_running)
-      @task.pid = 42
+      @task.ping
       post :abort, stack_id: @stack.to_param, id: @task.id, rollback: 'true'
 
       @task.reload

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: 20160324155046) do
+ActiveRecord::Schema.define(version: 20160426155146) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text     "permissions", limit: 65535
@@ -187,6 +187,7 @@ ActiveRecord::Schema.define(version: 20160324155046) do
   add_index "tasks", ["rolled_up", "created_at", "status"], name: "index_tasks_on_rolled_up_and_created_at_and_status"
   add_index "tasks", ["since_commit_id"], name: "index_tasks_on_since_commit_id"
   add_index "tasks", ["stack_id"], name: "index_tasks_on_stack_id"
+  add_index "tasks", ["status", "stack_id", "allow_concurrency"], name: "index_active_tasks"
   add_index "tasks", ["type", "stack_id", "parent_id"], name: "index_tasks_by_stack_and_parent"
   add_index "tasks", ["type", "stack_id", "status"], name: "index_tasks_by_stack_and_status"
   add_index "tasks", ["until_commit_id"], name: "index_tasks_on_until_commit_id"

data/test/fixtures/timeout

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+trap('INT') do
+  puts "Recieved SIGINT, aborting."
+  exit 1
+end
+
+trap('TERM') do
+  puts "Recieved SIGTERM, aborting."
+  exit 1
+end
+
+puts "Sleeping for 10 seconds"
+sleep 10
+puts "I wasn't killed? WTF"

data/test/jobs/perform_task_job_test.rb

@@ -65,13 +65,13 @@ module Shipit
     end
 
     test "mark deploy as error if a command timeout" do
-      Timeout.expects(:timeout).raises(Timeout::Error.new)
+      Command.any_instance.expects(:timed_out?).returns(true)
       Command.any_instance.expects(:terminate!)
       assert_nothing_raised do
         @job.perform(@deploy)
       end
-      assert @deploy.reload.error?
-      assert_includes @deploy.chunk_output, 'Timeout::Error'
+      assert_equal 'failed', @deploy.reload.status
+      assert_includes @deploy.chunk_output, 'TimedOut'
     end
 
     test "records stack support for rollbacks and fetching deployed revision" do

data/test/models/deploys_test.rb

@@ -241,6 +241,7 @@ module Shipit
 
     test "transitioning to aborted schedule a rollback if required" do
       @deploy = shipit_deploys(:shipit_running)
+      @deploy.ping
       @deploy.pid = 42
       @deploy.abort!(rollback_once_aborted: true)
 
@@ -317,51 +318,37 @@ module Shipit
       assert_equal @user, @stack.lock_author
     end
 
-    test "pid is persisted" do
-      clone = Deploy.find(@deploy.id)
-      assert_equal 42, clone.pid
-    end
-
     test "abort! transition to `aborting`" do
+      @deploy.ping
       @deploy.abort!
       assert_equal 'aborting', @deploy.status
     end
 
     test "abort! schedule the rollback if `rollback_once_aborted` is true" do
       @deploy.abort!(rollback_once_aborted: true)
-      assert @deploy.reload.rollback_once_aborted?
+      assert_predicate @deploy.reload, :rollback_once_aborted?
     end
 
-    test "abort! sends a SIGTERM to the recorded PID" do
-      Process.expects(:kill).with('TERM', @deploy.pid)
+    test "abort! record the abort order if the task is alive" do
+      @deploy.ping
+      aborts = []
+
       @deploy.abort!
-    end
+      @deploy.should_abort? { |abort_count| aborts << abort_count }
+      assert_equal [1], aborts
 
-    test "abort! still succeeds if the process is already dead" do
-      Process.expects(:kill).with('TERM', @deploy.pid).raises(Errno::ESRCH)
-      assert_nothing_raised do
-        @deploy.abort!
-      end
+      3.times { @deploy.abort! }
+      @deploy.should_abort? { |abort_count| aborts << abort_count }
+      assert_equal [1, 2, 3, 4], aborts
     end
 
-    test "abort! transition to `aborted` if the process is already dead" do
+    test "abort! mark the deploy as error if it isn't alive and isn't finished" do
       @deploy = shipit_deploys(:shipit_running)
-      @deploy.pid = 42
-
-      @deploy.abort!
-      assert_equal 'aborting', @deploy.status
+      refute_predicate @deploy, :alive?
+      refute_predicate @deploy, :finished?
 
-      Process.expects(:kill).with('TERM', @deploy.pid).raises(Errno::ESRCH)
       @deploy.abort!
-      assert_equal 'aborted', @deploy.status
-    end
-
-    test "abort! bails out if the PID is nil" do
-      Process.expects(:kill).never
-      @deploy.pid = nil
-      assert_nothing_raised do
-        @deploy.abort!
-      end
+      assert_predicate @deploy, :error?
     end
 
     test "destroy deletes the related output chunks" do
@@ -437,6 +424,12 @@ module Shipit
       assert_predicate @deploy, :flapping?
     end
 
+    test "#ping updates the task status key" do
+      refute_predicate @deploy, :alive?
+      @deploy.ping
+      assert_predicate @deploy, :alive?
+    end
+
     private
 
     def expect_event(deploy)

data/test/test_command_integration.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+path = './fixtures/timeout'
+buffer = []
+command = Shipit::Command.new({path => {'timeout' => 2}}, env: {}, chdir: __dir__)
+begin
+  command.stream! do |chunk|
+    buffer << chunk
+  end
+rescue Shipit::Command::TimedOut
+  # expected
+end
+
+expected_output = [
+  "Sleeping for 10 seconds\r\n",
+  "\e[1;31mNo output received in the last 2 seconds.\e[0m\n",
+  "\e[1;31mSending SIGINT to PID #{command.pid}\n\e[0m",
+  "Recieved SIGINT, aborting.\r\n",
+]
+
+unless buffer.join == expected_output.join
+  puts "Expected: -------"
+  puts expected_output.map(&:inspect).join("\n")
+  puts "Got: ------------"
+  puts buffer.map(&:inspect).join("\n")
+  puts "-----------------"
+  exit 1
+end

data/test/unit/command_test.rb

@@ -39,11 +39,20 @@ module Shipit
       assert_equal 5, command.timeout
     end
 
-    test "#timeout returnsthe command option timeout over the `default_timeout` if present" do
+    test "#timeout returns the command option timeout over the `default_timeout` if present" do
       command = Command.new({'cap $LANG deploy' => {'timeout' => 10}}, default_timeout: 5, env: {}, chdir: '.')
       assert_equal 10, command.timeout
     end
 
+    test "the process is properly terminated if it times out" do
+      # Minitest being run in an at_exit callback, signal handling etc is unreliable
+      assert system(
+        Engine.root.join('test/dummy/bin/rails').to_s,
+        'runner',
+        Engine.root.join('test/test_command_integration.rb').to_s,
+      )
+    end
+
     test "command not found" do
       error = assert_raises Command::NotFound do
         Command.new('does-not-exist foo bar', env: {}, chdir: '.').run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -632,6 +632,7 @@ files:
 - db/migrate/20160303170913_create_shipit_commit_deployment_statuses.rb
 - db/migrate/20160303203940_add_encrypted_token_to_users.rb
 - db/migrate/20160324155046_add_started_at_and_ended_at_on_tasks.rb
+- db/migrate/20160426155146_add_index_for_stack_active_task.rb
 - db/schema.rb
 - lib/shipit-engine.rb
 - lib/shipit.rb
@@ -709,34 +710,10 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.example.yml
 - test/dummy/config/secrets.yml
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/bar.txt
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/dkfdsf
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/dskjfsd
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/dslkjfjsdf
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/plopfizz
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/sd
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/sdkfjsdf
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/sdlfjsdfdsfj
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/sdlkfjsdlkfjsdlkfjdsfsdfksdfjsldkfjsdlkfjsdf
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/shipit.yml
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/toto.txt
-- test/dummy/data/stacks/byroot/junk/production/git/bar.txt
-- test/dummy/data/stacks/byroot/junk/production/git/dkfdsf
-- test/dummy/data/stacks/byroot/junk/production/git/dskjfsd
-- test/dummy/data/stacks/byroot/junk/production/git/dslkjfjsdf
-- test/dummy/data/stacks/byroot/junk/production/git/plopfizz
-- test/dummy/data/stacks/byroot/junk/production/git/sd
-- test/dummy/data/stacks/byroot/junk/production/git/sdkfjsdf
-- test/dummy/data/stacks/byroot/junk/production/git/sdlfjsdfdsfj
-- test/dummy/data/stacks/byroot/junk/production/git/sdlkfjsdlkfjsdlkfjdsfsdfksdfjsldkfjsdlkfjsdf
-- test/dummy/data/stacks/byroot/junk/production/git/shipit.yml
-- test/dummy/data/stacks/byroot/junk/production/git/toto.txt
-- test/dummy/data/stacks/byroot/test/production/git/README.md
 - test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
-- test/dummy/db/test.sqlite3-journal
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -758,6 +735,7 @@ files:
 - test/fixtures/shipit/tasks.yml
 - test/fixtures/shipit/teams.yml
 - test/fixtures/shipit/users.yml
+- test/fixtures/timeout
 - test/helpers/api_helper.rb
 - test/helpers/fixture_aliases_helper.rb
 - test/helpers/hooks_helper.rb
@@ -797,6 +775,7 @@ files:
 - test/models/task_definitions_test.rb
 - test/models/team_test.rb
 - test/models/users_test.rb
+- test/test_command_integration.rb
 - test/test_helper.rb
 - test/unit/command_test.rb
 - test/unit/commands_test.rb
@@ -883,34 +862,10 @@ test_files:
 - test/dummy/config/secrets.example.yml
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/bar.txt
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/dkfdsf
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/dskjfsd
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/dslkjfjsdf
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/plopfizz
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/sd
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/sdkfjsdf
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/sdlfjsdfdsfj
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/sdlkfjsdlkfjsdlkfjdsfsdfksdfjsldkfjsdlkfjsdf
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/shipit.yml
-- test/dummy/data/stacks/byroot/junk/production/deploys/83/toto.txt
-- test/dummy/data/stacks/byroot/junk/production/git/bar.txt
-- test/dummy/data/stacks/byroot/junk/production/git/dkfdsf
-- test/dummy/data/stacks/byroot/junk/production/git/dskjfsd
-- test/dummy/data/stacks/byroot/junk/production/git/dslkjfjsdf
-- test/dummy/data/stacks/byroot/junk/production/git/plopfizz
-- test/dummy/data/stacks/byroot/junk/production/git/sd
-- test/dummy/data/stacks/byroot/junk/production/git/sdkfjsdf
-- test/dummy/data/stacks/byroot/junk/production/git/sdlfjsdfdsfj
-- test/dummy/data/stacks/byroot/junk/production/git/sdlkfjsdlkfjsdlkfjdsfsdfksdfjsldkfjsdlkfjsdf
-- test/dummy/data/stacks/byroot/junk/production/git/shipit.yml
-- test/dummy/data/stacks/byroot/junk/production/git/toto.txt
-- test/dummy/data/stacks/byroot/test/production/git/README.md
 - test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
-- test/dummy/db/test.sqlite3-journal
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -933,6 +888,7 @@ test_files:
 - test/fixtures/shipit/tasks.yml
 - test/fixtures/shipit/teams.yml
 - test/fixtures/shipit/users.yml
+- test/fixtures/timeout
 - test/helpers/api_helper.rb
 - test/helpers/fixture_aliases_helper.rb
 - test/helpers/hooks_helper.rb
@@ -972,6 +928,7 @@ test_files:
 - test/models/task_definitions_test.rb
 - test/models/team_test.rb
 - test/models/users_test.rb
+- test/test_command_integration.rb
 - test/test_helper.rb
 - test/unit/command_test.rb
 - test/unit/commands_test.rb

data/test/dummy/data/stacks/byroot/junk/production/deploys/83/bar.txt

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

data/test/dummy/data/stacks/byroot/junk/production/deploys/83/sdkfjsdf

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

data/test/dummy/data/stacks/byroot/junk/production/deploys/83/shipit.yml

@@ -1,32 +0,0 @@
-review:
-  checklist:
-    - Blah Blah
-  checks:
-    - echo 42
-
-deploy:
-  variables:
-    -
-      name: REBUILD
-      title: Force artifacts rebuild
-      default: '0'
-  pre:
-    - echo pre
-  override:
-    - echo 1
-    - env
-    - sleep 10
-  post:
-    - echo post
- 
-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/deploys/83/toto.txt

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

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

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

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

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

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

@@ -1,32 +0,0 @@
-review:
-  checklist:
-    - Blah Blah
-  checks:
-    - echo 42
-
-deploy:
-  variables:
-    -
-      name: REBUILD
-      title: Force artifacts rebuild
-      default: '0'
-  pre:
-    - echo pre
-  override:
-    - echo 1
-    - env
-    - sleep 10
-  post:
-    - echo post
- 
-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

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

data/test/dummy/data/stacks/byroot/test/production/git/README.md

@@ -1 +0,0 @@
-# test