summaryrefslogtreecommitdiff
path: root/spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb')
-rw-r--r--spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb
index 24b507e..9325a0b 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_ssh.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