From 57e40fd6e12642dc7a67bc5e7c190a5711beb817 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Wed, 4 Mar 2020 16:15:05 -0800 Subject: [PATCH] Use env script to load env vars for testing --- .ci/spec/clean-packet.sh | 16 +--------------- .ci/spec/create-hosts.sh | 16 +--------------- .ci/spec/create-packet.sh | 16 +--------------- .ci/spec/run-test.sh | 16 +--------------- 4 files changed, 4 insertions(+), 60 deletions(-) diff --git a/.ci/spec/clean-packet.sh b/.ci/spec/clean-packet.sh index cc3640dc1..3a8189685 100755 --- a/.ci/spec/clean-packet.sh +++ b/.ci/spec/clean-packet.sh @@ -1,24 +1,10 @@ #!/usr/bin/env bash -# packet and job configuration -export SLACK_USERNAME="Vagrant" -export SLACK_ICON="https://media.giphy.com/media/yIQ5glQeheYE0/200.gif" -export SLACK_TITLE="Vagrant-Spec Test Runner" -export PACKET_EXEC_DEVICE_NAME="${PACKET_EXEC_DEVICE_NAME:-spec-ci-boxes}" -export PACKET_EXEC_DEVICE_SIZE="${PACKET_EXEC_DEVICE_SIZE:-baremetal_0,baremetal_1,baremetal_1e}" -export PACKET_EXEC_PREFER_FACILITIES="${PACKET_EXEC_PREFER_FACILITIES:-iad1,iad2,ewr1,dfw1,dfw2,sea1,sjc1,lax1}" -export PACKET_EXEC_OPERATING_SYSTEM="${PACKET_EXEC_OPERATING_SYSTEM:-ubuntu_18_04}" -export PACKET_EXEC_PRE_BUILTINS="${PACKET_EXEC_PRE_BUILTINS:-InstallVagrant,InstallVirtualBox,InstallVmware,InstallHashiCorpTool,InstallVagrantVmware}" -export PACKET_EXEC_QUIET="1" -export PKT_VAGRANT_CLOUD_TOKEN="${VAGRANT_CLOUD_TOKEN}" -export VAGRANT_PKG_VERSION="2.2.7" # need to figure out how to make this latest instead -### - - csource="${BASH_SOURCE[0]}" while [ -h "$csource" ] ; do csource="$(readlink "$csource")"; done root="$( cd -P "$( dirname "$csource" )/../" && pwd )" +. "${root}/.ci/spec/env.sh" . "${root}/.ci/common.sh" pushd "${root}" > "${output}" diff --git a/.ci/spec/create-hosts.sh b/.ci/spec/create-hosts.sh index a4eff3a03..66721cceb 100755 --- a/.ci/spec/create-hosts.sh +++ b/.ci/spec/create-hosts.sh @@ -1,24 +1,10 @@ #!/usr/bin/env bash -# packet and job configuration -export SLACK_USERNAME="Vagrant" -export SLACK_ICON="https://media.giphy.com/media/yIQ5glQeheYE0/200.gif" -export SLACK_TITLE="Vagrant-Spec Test Runner" -export PACKET_EXEC_DEVICE_NAME="${PACKET_EXEC_DEVICE_NAME:-spec-ci-boxes}" -export PACKET_EXEC_DEVICE_SIZE="${PACKET_EXEC_DEVICE_SIZE:-baremetal_0,baremetal_1,baremetal_1e}" -export PACKET_EXEC_PREFER_FACILITIES="${PACKET_EXEC_PREFER_FACILITIES:-iad1,iad2,ewr1,dfw1,dfw2,sea1,sjc1,lax1}" -export PACKET_EXEC_OPERATING_SYSTEM="${PACKET_EXEC_OPERATING_SYSTEM:-ubuntu_18_04}" -export PACKET_EXEC_PRE_BUILTINS="${PACKET_EXEC_PRE_BUILTINS:-InstallVagrant,InstallVirtualBox,InstallVmware,InstallHashiCorpTool,InstallVagrantVmware}" -export PACKET_EXEC_QUIET="1" -export PKT_VAGRANT_CLOUD_TOKEN="${VAGRANT_CLOUD_TOKEN}" -export VAGRANT_PKG_VERSION="2.2.7" # need to figure out how to make this latest instead -### - - csource="${BASH_SOURCE[0]}" while [ -h "$csource" ] ; do csource="$(readlink "$csource")"; done root="$( cd -P "$( dirname "$csource" )/../" && pwd )" +. "${root}/.ci/spec/env.sh" . "${root}/.ci/common.sh" pushd "${root}" > "${output}" diff --git a/.ci/spec/create-packet.sh b/.ci/spec/create-packet.sh index 3a36bd104..fee050381 100755 --- a/.ci/spec/create-packet.sh +++ b/.ci/spec/create-packet.sh @@ -1,24 +1,10 @@ #!/usr/bin/env bash -# packet and job configuration -export SLACK_USERNAME="Vagrant" -export SLACK_ICON="https://media.giphy.com/media/yIQ5glQeheYE0/200.gif" -export SLACK_TITLE="Vagrant-Spec Test Runner" -export PACKET_EXEC_DEVICE_NAME="${PACKET_EXEC_DEVICE_NAME:-spec-ci-boxes}" -export PACKET_EXEC_DEVICE_SIZE="${PACKET_EXEC_DEVICE_SIZE:-baremetal_0,baremetal_1,baremetal_1e}" -export PACKET_EXEC_PREFER_FACILITIES="${PACKET_EXEC_PREFER_FACILITIES:-iad1,iad2,ewr1,dfw1,dfw2,sea1,sjc1,lax1}" -export PACKET_EXEC_OPERATING_SYSTEM="${PACKET_EXEC_OPERATING_SYSTEM:-ubuntu_18_04}" -export PACKET_EXEC_PRE_BUILTINS="${PACKET_EXEC_PRE_BUILTINS:-InstallVagrant,InstallVirtualBox,InstallVmware,InstallHashiCorpTool,InstallVagrantVmware}" -export PACKET_EXEC_QUIET="1" -export PKT_VAGRANT_CLOUD_TOKEN="${VAGRANT_CLOUD_TOKEN}" -export VAGRANT_PKG_VERSION="2.2.7" # need to figure out how to make this latest instead -### - - csource="${BASH_SOURCE[0]}" while [ -h "$csource" ] ; do csource="$(readlink "$csource")"; done root="$( cd -P "$( dirname "$csource" )/../" && pwd )" +. "${root}/.ci/spec/env.sh" . "${root}/.ci/common.sh" pushd "${root}" > "${output}" diff --git a/.ci/spec/run-test.sh b/.ci/spec/run-test.sh index ca9da5e69..87dd2a1c6 100755 --- a/.ci/spec/run-test.sh +++ b/.ci/spec/run-test.sh @@ -1,24 +1,10 @@ #!/usr/bin/env bash -# packet and job configuration -export SLACK_USERNAME="Vagrant" -export SLACK_ICON="https://media.giphy.com/media/yIQ5glQeheYE0/200.gif" -export SLACK_TITLE="Vagrant-Spec Test Runner" -export PACKET_EXEC_DEVICE_NAME="${PACKET_EXEC_DEVICE_NAME:-spec-ci-boxes}" -export PACKET_EXEC_DEVICE_SIZE="${PACKET_EXEC_DEVICE_SIZE:-baremetal_0,baremetal_1,baremetal_1e}" -export PACKET_EXEC_PREFER_FACILITIES="${PACKET_EXEC_PREFER_FACILITIES:-iad1,iad2,ewr1,dfw1,dfw2,sea1,sjc1,lax1}" -export PACKET_EXEC_OPERATING_SYSTEM="${PACKET_EXEC_OPERATING_SYSTEM:-ubuntu_18_04}" -export PACKET_EXEC_PRE_BUILTINS="${PACKET_EXEC_PRE_BUILTINS:-InstallVagrant,InstallVirtualBox,InstallVmware,InstallHashiCorpTool,InstallVagrantVmware}" -export PACKET_EXEC_QUIET="1" -export PKT_VAGRANT_CLOUD_TOKEN="${VAGRANT_CLOUD_TOKEN}" -export VAGRANT_PKG_VERSION="2.2.7" # need to figure out how to make this latest instead -### - - csource="${BASH_SOURCE[0]}" while [ -h "$csource" ] ; do csource="$(readlink "$csource")"; done root="$( cd -P "$( dirname "$csource" )/../" && pwd )" +. "${root}/.ci/spec/env.sh" . "${root}/.ci/common.sh" pushd "${root}" > "${output}"