Update specs and fix FM-1361

- Add install.rb for pre-suite
- Add catches for failures/changes to manifest application
- Correct root ssh key copying
- Add sleeps for killing processes releasing ports
- Fix FM-1361

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/acceptance/beaker_helper.rb b/spec/acceptance/beaker_helper.rb
new file mode 100644
index 0000000..2bf663b
--- /dev/null
+++ b/spec/acceptance/beaker_helper.rb
@@ -0,0 +1,18 @@
+test_name "Installing Puppet and vcsrepo module" do
+  step 'install puppet' do
+    if @options[:provision]
+      # This will fail if puppet is already installed, ie --no-provision
+      if hosts.first.is_pe?
+        install_pe
+      else
+        install_puppet
+      end
+    end
+  end
+  step 'install module' do
+    proj_root = File.expand_path(File.join(File.dirname(__FILE__),'..','..'))
+    # Waiting on release of puppet_module_install in beaker
+    #puppet_module_install(:source => proj_root, :module_name => 'vcsrepo')
+    scp_to(hosts, proj_root, File.join(hosts.first['distmoduledir'], 'vcsrepo'))
+  end
+end