From df3c0b6b0fbe18e89af32eed714e386f92e4887a Mon Sep 17 00:00:00 2001
From: Paul Hinze <phinze@phinze.com>
Date: Tue, 5 Apr 2022 17:37:08 -0500
Subject: [PATCH] ci: install gem and use go binary for test runs

---
 test/vagrant-spec/scripts/ubuntu-install-vagrant.sh | 3 ++-
 test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh  | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/vagrant-spec/scripts/ubuntu-install-vagrant.sh b/test/vagrant-spec/scripts/ubuntu-install-vagrant.sh
index 53300c675..b343be8ac 100755
--- a/test/vagrant-spec/scripts/ubuntu-install-vagrant.sh
+++ b/test/vagrant-spec/scripts/ubuntu-install-vagrant.sh
@@ -23,7 +23,8 @@ git config --global url."https://${HASHIBOT_USERNAME}:${HASHIBOT_TOKEN}@github.c
 gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)"
 make
 bundle install
-ln -s /vagrant/vagrant /bin/vagrant
+gem build vagrant.gemspec
+gem install vagrant*.gem
 
 popd
 
diff --git a/test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh b/test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh
index 32a80bf94..88e1244e2 100644
--- a/test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh
+++ b/test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh
@@ -3,6 +3,10 @@ set -x
 
 export VAGRANT_EXPERIMENTAL="${VAGRANT_EXPERIMENTAL:-1}"
 export VAGRANT_SPEC_BOX="${VAGRANT_SPEC_BOX}"
+
+# Explicitly use Go binary
+export VAGRANT_PATH=/vagrant/vagrant
+
 vagrant-spec ${VAGRANT_SPEC_ARGS} --config /vagrant/test/vagrant-spec/configs/vagrant-spec.config.virtualbox.rb
 result=$?