Merge pull request #14220 from jameswnl/project-refresh

Refresh to pick up scm options for Tower Project
ManageIQ · Mar 9, 2017 · c9e9ae1 · c9e9ae1
2 parents b608548 + 4a4d0b0
commit c9e9ae1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 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
@@ -48,6 +48,13 @@ def configuration_script_sources
       inventory_object = persister.configuration_script_sources.find_or_build(project.id.to_s)
       inventory_object.description = project.description
       inventory_object.name = project.name
+      inventory_object.authentication = persister.credentials.lazy_find(project.credential_id.to_s)
+      inventory_object.scm_type = project.scm_type
+      inventory_object.scm_url = project.scm_url
+      inventory_object.scm_branch = project.scm_branch
+      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
 
       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,7 @@ def has_configuration_script_sources(options = {})
       has_inventory({
         :model_class                 => ::ConfigurationScriptSource,
         :manager_ref                 => [:manager_ref],
-        :inventory_object_attributes => %i(name description),
+        :inventory_object_attributes => %i(name description scm_type scm_url scm_branch scm_clean scm_delete_on_update scm_update_on_launch authentication),
       }.merge(options))
     end
 

diff --git a/spec/models/manageiq/providers/ansible_tower/automation_manager/refresher_spec.rb b/spec/models/manageiq/providers/ansible_tower/automation_manager/refresher_spec.rb
@@ -110,17 +110,24 @@ def assert_credentials
 
   def assert_playbooks
     expect(expected_configuration_script_source.configuration_script_payloads.first).to be_an_instance_of(ManageIQ::Providers::AnsibleTower::AutomationManager::Playbook)
-    expect(expected_configuration_script_source.configuration_script_payloads.count).to eq(1)
-    expect(expected_configuration_script_source.configuration_script_payloads.map(&:name)).to include('hello_world.yml')
+    expect(expected_configuration_script_source.configuration_script_payloads.count).to eq(8)
+    expect(expected_configuration_script_source.configuration_script_payloads.map(&:name)).to include('start_ec2.yml')
   end
 
   def assert_configuration_script_sources
     expect(automation_manager.configuration_script_sources.count).to eq(6)
     expect(expected_configuration_script_source).to be_an_instance_of(ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationScriptSource)
     expect(expected_configuration_script_source).to have_attributes(
-      :name        => 'Demo Project',
-      :description => 'A great demo',
+      :name                 => 'DB_Github',
+      :description          => 'DB Playbooks',
+      :scm_type             => 'git',
+      :scm_url              => 'https://github.com/syncrou/playbooks',
+      :scm_branch           => 'master',
+      :scm_clean            => false,
+      :scm_delete_on_update => false,
+      :scm_update_on_launch => true
     )
+    expect(expected_configuration_script_source.authentication.name).to eq('db-github')
   end
 
   def assert_configured_system
@@ -181,6 +188,6 @@ def expected_inventory_root_group
   end
 
   def expected_configuration_script_source
-    @expected_configuration_script_source ||= automation_manager.configuration_script_sources.find_by(:name => 'Demo Project')
+    @expected_configuration_script_source ||= automation_manager.configuration_script_sources.find_by(:name => 'DB_Github')
   end
 end