Skip to content

Commit

Permalink
Revert "Validate deployed vm via SSH and agent id."
Browse files Browse the repository at this point in the history
This reverts commit b959236.

Failing on the vsphere/vcloud pipeline, need to fix this spec.
  • Loading branch information
aaronshurley committed Nov 11, 2015
1 parent e0f3f7f commit f6fb0db
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions spec/system/with_release_stemcell_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,22 +119,15 @@ def matchdata_to_h(matchdata)
it 'should have network access to the vm using the manual static ip' do
skip "not applicable for dynamic networking" if dynamic_networking?

ssh_with_agent_forwarding = @our_ssh_options.merge(forward_agent: true)
vm = wait_for_vm('colocated/0')
ssh_cmd = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no vcap@#{static_ip} hostname"

expect(vm).to_not be_nil
expect(static_ip).to_not be_nil
expect(ssh(director_ip, 'vcap', ssh_cmd, ssh_with_agent_forwarding)).to match /#{vm[:agent_id]}/
expect(static_ip).not_to be_nil
expect(ssh_sudo(director_ip, 'vcap', "ping -qc1 #{static_ip}; echo $?", ssh_options)).to end_with("0\n")
end

it 'should have network access to the vm using the vip' do
skip "vip network isn't supported" unless includes_vip?

vm = wait_for_vm('colocated/0')
expect(vm).to_not be_nil
expect(vip).to_not be_nil
expect(ssh(vip, 'vcap', 'hostname', @our_ssh_options)).to match /#{vm[:agent_id]}/
expect(vip).not_to be_nil
expect(ssh(vip, 'vcap', '/sbin/ifconfig eth0', @our_ssh_options)).to match /#{static_ip}/
end

context 'changing the persistent disk size' do
Expand Down

0 comments on commit f6fb0db

Please sign in to comment.