X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=.ci%2Flinux-setup.sh;h=f5ef6b1b9832a38667c48506a6690c96a5bd5675;hb=3cc977704be6d4db3655da5afb2e87f114cd42d3;hp=2b07d1e0b2c12410419a2eb87c989dbbac3db340;hpb=31bb45bcfdf5d67737eab17747b383775c9c36ae;p=dpdk.git diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh index 2b07d1e0b2..f5ef6b1b98 100755 --- a/.ci/linux-setup.sh +++ b/.ci/linux-setup.sh @@ -1,12 +1,12 @@ #!/bin/sh -xe +# Builds are run as root in containers, no need for sudo +[ "$(id -u)" != '0' ] || alias sudo= + # need to install as 'root' since some of the unit tests won't run without it -sudo python3 -m pip install --upgrade 'meson==0.47.1' +sudo python3 -m pip install --upgrade 'meson==0.49.2' -# skip hugepage settings if tests will not run -if [ "$RUN_TESTS" = "1" ]; then - # setup hugepages - cat /proc/meminfo - sudo sh -c 'echo 1024 > /proc/sys/vm/nr_hugepages' - cat /proc/meminfo -fi +# setup hugepages. error ignored because having hugepage is not mandatory. +cat /proc/meminfo +sudo sh -c 'echo 1024 > /proc/sys/vm/nr_hugepages' || true +cat /proc/meminfo