summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@verizonmedia.com>2021-01-05 18:28:04 +0100
committerArnstein Ressem <aressem@verizonmedia.com>2021-01-05 18:28:04 +0100
commit98e00d76ef4fe7f3d2f34102790af44e596656bb (patch)
treeb4625eb29ab8a164b5a5d701652678dd968ed7c4
parentce45259746aa9ff82121cdcb959e597187444463 (diff)
Make sure USER is set.
-rw-r--r--screwdriver.yaml1
-rwxr-xr-xtravis/travis-build.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml
index 6b3795e6da6..f772c120e96 100644
--- a/screwdriver.yaml
+++ b/screwdriver.yaml
@@ -15,6 +15,7 @@ jobs:
screwdriver.cd/timeout: 600
environment:
+ USER_SHELL_BIN: bash
LOCAL_MVN_REPO: "/tmp/vespa/mvnrepo"
VESPA_MAVEN_EXTRA_OPTS: "-Dmaven.repo.local=/tmp/vespa/mvnrepo -Dmaven.javadoc.skip=true -Dmaven.source.skip=true"
CCACHE_TMP_DIR: "/tmp/ccache_tmp"
diff --git a/travis/travis-build.sh b/travis/travis-build.sh
index 3e928676b73..23f4fbb0772 100755
--- a/travis/travis-build.sh
+++ b/travis/travis-build.sh
@@ -69,6 +69,7 @@ if [[ $SHOULD_BUILD == systemtest ]]; then
export SYSTEM_TEST_DIR=$(pwd)/system-test
export RUBYLIB="$SYSTEM_TEST_DIR/lib:$SYSTEM_TEST_DIR/tests"
useradd vespa
+ export USER=$(whoami)
$SYSTEM_TEST_DIR/lib/node_server.rb &
NODE_SERVER_PID=$!