From cb635fce6d8926b075963c32a3ee121f4e107008 Mon Sep 17 00:00:00 2001 From: sophia Date: Thu, 3 Sep 2020 16:02:30 -0500 Subject: [PATCH] Don't reload Vagrant to run tests --- .ci/spec/create-hosts.sh | 2 -- .ci/spec/run-test.sh | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.ci/spec/create-hosts.sh b/.ci/spec/create-hosts.sh index ca962dc5f..253cf240d 100755 --- a/.ci/spec/create-hosts.sh +++ b/.ci/spec/create-hosts.sh @@ -9,8 +9,6 @@ root="$( cd -P "$( dirname "$csource" )/../../" && pwd )" pushd "${root}" > "${output}" -# Assumes packet is already set up - # spec test configuration, defined by action runners, used by Vagrant on packet export PKT_VAGRANT_HOST_BOXES="${VAGRANT_HOST_BOXES}" export PKT_VAGRANT_GUEST_BOXES="${VAGRANT_GUEST_BOXES}" diff --git a/.ci/spec/run-test.sh b/.ci/spec/run-test.sh index c6ee4c8ea..684326675 100755 --- a/.ci/spec/run-test.sh +++ b/.ci/spec/run-test.sh @@ -10,9 +10,7 @@ root="$( cd -P "$( dirname "$csource" )/../../" && pwd )" pushd "${root}" > "${output}" # Assumes packet is already set up - -# job_id is provided by common.sh -echo "PACKET_EXEC_REMOTE_DIRECTORY: ${PACKET_EXEC_REMOTE_DIRECTORY}" +unset PACKET_EXEC_PRE_BUILTINS # spec test configuration, defined by action runners, used by Vagrant on packet export PKT_VAGRANT_HOST_BOXES="${VAGRANT_HOST_BOXES}" @@ -22,12 +20,11 @@ export PKT_VAGRANT_HOST_MEMORY="${VAGRANT_HOST_MEMORY:-10000}" export PKT_VAGRANT_CWD="test/vagrant-spec/" export PKT_VAGRANT_VAGRANTFILE=Vagrantfile.spec ### - # Run the job echo "Running vagrant spec tests..." # Need to make memory customizable for windows hosts -pkt_wrap_stream "vagrant reload --provision" \ +wrap_stream packet-exec run "vagrant provision" \ "Vagrant Blackbox testing command failed" echo "Finished vagrant spec tests"