diff options
| -rwxr-xr-x | screwdriver/build-vespa.sh | 2 | ||||
| -rwxr-xr-x | screwdriver/detect-what-to-build.sh | 3 | ||||
| -rwxr-xr-x | vespabase/src/common-env.sh | 12 |
3 files changed, 12 insertions, 5 deletions
diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh index 91375728ca9..fef125760bb 100755 --- a/screwdriver/build-vespa.sh +++ b/screwdriver/build-vespa.sh @@ -3,6 +3,8 @@ set -e +export VESPA_MAVEN_EXTRA_OPTS="-Dmaven.repo.local=/tmp/vespa/mvnrepo -Dmaven.javadoc.skip=true -Dmaven.source.skip=true" + readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd )" readonly NUM_THREADS=$(( $(nproc) + 2 )) diff --git a/screwdriver/detect-what-to-build.sh b/screwdriver/detect-what-to-build.sh index 608dfda9e0e..bcb01ac844d 100755 --- a/screwdriver/detect-what-to-build.sh +++ b/screwdriver/detect-what-to-build.sh @@ -6,6 +6,9 @@ if (( ${#BASH_SOURCE[@]} == 1 )); then exit 1 fi +export SHOULD_BUILD=systemtest +return 0 + if [[ $SD_PULL_REQUEST == false ]]; then export SHOULD_BUILD=all return 0 diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index 51b7e995273..da4b5f8deb0 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -299,12 +299,12 @@ get_numa_ctl_cmd () { exit 1 fi - numnodes=$(numactl --hardware 2>/dev/null | - grep available | - awk '$3 == "nodes" { print $2 }') + if numactl --interleave all echo &> /dev/null; then + # We are allowed to use numactl + numnodes=$(numactl --hardware 2>/dev/null | + grep available | + awk '$3 == "nodes" { print $2 }') - if [ -n "$numnodes" ]; then - # We are allowed to use numactl and have NUMA nodes if [ "$VESPA_AFFINITY_CPU_SOCKET" ] && [ "$numnodes" -gt 1 ] then @@ -314,8 +314,10 @@ get_numa_ctl_cmd () { numactlcmd="numactl --interleave all" fi else + log_warning_message "Permission denied to use numactl. Continuing without using numactl." numactlcmd="" fi echo $numactlcmd } + |