summaryrefslogtreecommitdiff
path: root/spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppetlabs.com>2014-05-20 18:15:03 -0700
committerHunter Haugen <hunter@puppetlabs.com>2014-05-21 16:49:26 -0700
commit0d9e938e92a25673c3712866e2d2108a255b67d5 (patch)
tree9b183ce838cb37823ec525407050a362b1eedf1c /spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb
parent93e0c80f38efbd1317fc3b71218cc7fd047d639a (diff)
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
Diffstat (limited to 'spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb')
-rw-r--r--spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb
index c920fb4..fb6a20a 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_scp.rb
@@ -13,17 +13,18 @@ hosts.each do |host|
end
step 'setup - establish ssh keys' do
# create ssh keys
- on(host, 'ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N ""')
+ on(host, 'yes | ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N ""')
# copy public key to authorized_keys
+ on(host, 'cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys')
on(host, 'echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /root/.ssh/config')
on(host, 'chown -R root:root /root/.ssh')
end
teardown do
on(host, "rm -fr #{tmpdir}")
- apply_manifest_on(host, "file{'/root/.ssh/id_rsa': ensure => absent, force => true }")
- apply_manifest_on(host, "file{'/root/.ssh/id_rsa.pub': ensure => absent, force => true }")
+ apply_manifest_on(host, "file{'/root/.ssh/id_rsa': ensure => absent, force => true }", :catch_failures => true)
+ apply_manifest_on(host, "file{'/root/.ssh/id_rsa.pub': ensure => absent, force => true }", :catch_failures => true)
end
step 'get revision sha from repo' do
@@ -42,8 +43,8 @@ hosts.each do |host|
}
EOS
- apply_manifest_on(host, pp)
- apply_manifest_on(host, pp)
+ apply_manifest_on(host, pp, :catch_failures => true)
+ apply_manifest_on(host, pp, :catch_changes => true)
end
step "verify checkout is set to revision #{@sha}" do