From 1da79d8f0814334523e7239fa8d0d280a7f1cf38 Mon Sep 17 00:00:00 2001 From: algonautshant Date: Thu, 19 Dec 2019 12:23:32 -0500 Subject: [PATCH] Fixing arm64 environment issues 1) python3-venv libffi-dev libssl-dev libffi-dev (and libssl-dev) are needed by the cryptography package builder for python in e2e_basic_start_stop. 2) exporting GOPATHBIN needed to run algotmpl in template e2e tests. --- scripts/travis/configure_dev.sh | 2 +- scripts/travis/integration_test.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/travis/configure_dev.sh b/scripts/travis/configure_dev.sh index e8ea08439b..06282f992d 100755 --- a/scripts/travis/configure_dev.sh +++ b/scripts/travis/configure_dev.sh @@ -30,7 +30,7 @@ if [ "${OS}" = "linux" ]; then fi set -e sudo apt-get update -y - sudo apt-get -y install sqlite3 + sudo apt-get -y install sqlite3 python3-venv libffi-dev libssl-dev fi if [[ "${ARCH}" = "arm" ]]; then sudo sh -c 'echo "CONF_SWAPSIZE=1024" > /etc/dphys-swapfile; dphys-swapfile setup; dphys-swapfile swapon' diff --git a/scripts/travis/integration_test.sh b/scripts/travis/integration_test.sh index 462298dcf9..a26d14a53c 100755 --- a/scripts/travis/integration_test.sh +++ b/scripts/travis/integration_test.sh @@ -14,11 +14,15 @@ export BUILD_TYPE="integration" if [ "${USER}" = "travis" ]; then # we're running on a travis machine "${SCRIPTPATH}/build.sh" --make_debug + GOPATHBIN=$(go env GOPATH)/bin + export PATH=$PATH:$GOPATHBIN "${SCRIPTPATH}/travis_wait.sh" 90 "${SCRIPTPATH}/test.sh" else # we're running on an ephermal build machine "${SCRIPTPATH}/build.sh" --make_debug + GOPATHBIN=$(go env GOPATH)/bin + export PATH=$PATH:$GOPATHBIN "${SCRIPTPATH}/test.sh" fi -echo "Integration test completed successfully" \ No newline at end of file +echo "Integration test completed successfully"