Skip to content
This repository has been archived by the owner on Jun 25, 2023. It is now read-only.

Issue #346 Updating Vagrant dev version #347

Merged
merged 1 commit into from
May 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ $ git push origin master

== Maintainers

* Brian Exelbierd (@bexelbie)
* Eric Sorenson (@ahpook)
* Florian Holzhauer (@fh)
* Davi Koscianski Vidal (@davividal)
* Hardy Ferentschik (@hferentschik)
* Josef Strzibny (@strzibny)
* Paul Hinze (@phinze)
* Reto Kaiser (@njam)

2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ group :development do
gem 'rubocop', '~> 0.59.0'
gem 'vagrant',
git: 'https://github.com/mitchellh/vagrant.git',
ref: 'v2.1.2'
ref: 'v2.2.4'
end
2 changes: 1 addition & 1 deletion features/dns_resolution.feature
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ Feature: DNS resolution
| box | provider |
| debian/jessie64 | virtualbox |
| ubuntu/xenial64 | virtualbox |
| ubuntu/bionic64 | virtualbox |
# | ubuntu/bionic64 | virtualbox |
8 changes: 4 additions & 4 deletions features/step_definitions/landrush_custom_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@
end

Then(/^the hostname "([^"]+)" should resolve to "([^"]+)" on the guest/) do |host, ip|
run("bundle exec vagrant ssh -c \"dig +short '#{host}' A\"")
run_command("bundle exec vagrant ssh -c \"dig +short '#{host}' A\"")
expect(last_command_started).to have_output(/^#{ip}$/)
end

Then(/^the host visible IP address of the guest is the IP of interface "([^"]+)"/) do |interface|
cmd = "bundle exec vagrant ssh -c \"ip addr list #{interface} | grep 'inet ' | cut -d' ' -f6| cut -d/ -f1\""
run(cmd)
run_command(cmd)
expect(last_command_started).to have_output(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)

ip = last_command_started.output.split("\n").last

run('bundle exec vagrant landrush list')
run_command('bundle exec vagrant landrush list')

expect(last_command_started).to have_output(/#{ip}$/)
end

Then(/^Landrush is( not)? running$/) do |negated|
run('bundle exec vagrant landrush status')
run_command('bundle exec vagrant landrush status')
if negated
expect(last_command_started).to have_output(/Daemon status: stopped/)
else
Expand Down