Add action to deploymentadd-action-to-deployment-backup

5 files changed, 29 insertions, 1 deletions

diff --git a/app/models/concerns/deployable.rb b/app/models/concerns/deployable.rb
index ba3abf28ab0..d85d624fff3 100644
--- a/app/models/concerns/deployable.rb
+++ b/app/models/concerns/deployable.rb
@@ -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 eecb927ad01..9cea601f4bf 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -47,6 +47,12 @@ class Deployment < ActiveRecord::Base
     end
   end
 
+  enum_with_nil action: {
+    unknown_action: nil,
+    start: 1,
+    stop: 2
+  }
+
   enum status: {
     created: 0,
     running: 1,
diff --git a/changelogs/unreleased/add-action-to-deployment-backup.yml b/changelogs/unreleased/add-action-to-deployment-backup.yml
new file mode 100644
index 00000000000..2e55351a0ab
--- /dev/null
+++ b/changelogs/unreleased/add-action-to-deployment-backup.yml
@@ -0,0 +1,5 @@
+---
+title: Add action to deployment
+merge_request: 22678
+author:
+type: changed
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..a70ead45e03
--- /dev/null
+++ b/db/migrate/20181030150739_add_action_to_deployments.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddActionToDeployments < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    add_column :deployments, :action, :integer, limit: 2
+  end
+
+  def down
+    remove_column :deployments, :action, :integer, limit: 2
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8594fc8d25a..762f3553877 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -826,6 +826,7 @@ ActiveRecord::Schema.define(version: 20181031190559) 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
   end
 
   add_index "deployments", ["created_at"], name: "index_deployments_on_created_at", using: :btree