Merge pull request #14687 from jameswnl/repo-status

Pickup Tower Project's repo-sync status (cherry picked from commit 84006ef)
ManageIQ · Apr 11, 2017 · 8479214 · 8479214
1 parent 54ffffa
commit 8479214
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/app/models/manageiq/providers/ansible_tower/shared/inventory/parser/automation_manager.rb b/app/models/manageiq/providers/ansible_tower/shared/inventory/parser/automation_manager.rb
@@ -60,6 +60,7 @@ def configuration_script_sources
       inventory_object.scm_clean = project.scm_clean
       inventory_object.scm_delete_on_update = project.scm_delete_on_update
       inventory_object.scm_update_on_launch = project.scm_update_on_launch
+      inventory_object.status = project.status
 
       project.playbooks.each do |playbook_name|
         inventory_object_playbook = persister.configuration_script_payloads.find_or_build_by(

diff --git a/app/models/manager_refresh/inventory/core.rb b/app/models/manager_refresh/inventory/core.rb
@@ -26,7 +26,10 @@ def has_configuration_script_sources(options = {})
       has_inventory({
         :model_class                 => ::ConfigurationScriptSource,
         :manager_ref                 => [:manager_ref],
-        :inventory_object_attributes => %i(name description scm_type scm_url scm_branch scm_clean scm_delete_on_update scm_update_on_launch authentication),
+        :inventory_object_attributes => %i(
+          name description scm_type scm_url scm_branch scm_clean scm_delete_on_update
+          scm_update_on_launch authentication status
+        ),
       }.merge(options))
     end
 

diff --git a/db/migrate/20170320195660_add_status_to_configuration_script_source.rb b/db/migrate/20170320195660_add_status_to_configuration_script_source.rb
@@ -0,0 +1,5 @@
+class AddStatusToConfigurationScriptSource < ActiveRecord::Migration[5.0]
+  def change
+    add_column :configuration_script_sources, :status, :string
+  end
+end
diff --git a/db/schema.yml b/db/schema.yml
@@ -553,6 +553,7 @@ configuration_script_sources:
 - scm_update_on_launch
 - authentication_id
 - type
+- status
 configuration_scripts:
 - id
 - manager_id

diff --git a/spec/support/ansible_shared/automation_manager/refresher.rb b/spec/support/ansible_shared/automation_manager/refresher.rb
@@ -133,7 +133,8 @@ def assert_configuration_script_sources
       :scm_branch           => 'master',
       :scm_clean            => false,
       :scm_delete_on_update => false,
-      :scm_update_on_launch => true
+      :scm_update_on_launch => true,
+      :status               => 'successful'
     )
     expect(expected_configuration_script_source.authentication.name).to eq('db-github')
   end