From 2ace3cf68390e7490a6f34a7ac62042f9fc17e7e Mon Sep 17 00:00:00 2001
From: Matias Elo <matias.elo@nokia.com>
Date: Thu, 23 Mar 2023 14:59:28 +0200
Subject: ci: mount huge pages before odp build

Mounting huge pages fails randomly in GitHub Actions if VM disk is close to
full. Maximize probability that mounting succeeds by mounting huge pages
before ODP build.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
---
 scripts/ci/check_inline_timer.sh | 8 ++++----
 scripts/ci/check_pktio.sh        | 8 ++++----
 scripts/ci/coverage.sh           | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/scripts/ci/check_inline_timer.sh b/scripts/ci/check_inline_timer.sh
index 1fa9c21f5..48800be35 100755
--- a/scripts/ci/check_inline_timer.sh
+++ b/scripts/ci/check_inline_timer.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 set -e
 
-"`dirname "$0"`"/build_${ARCH}.sh
-
-cd "$(dirname "$0")"/../..
-
 echo 1000 | tee /proc/sys/vm/nr_hugepages
 mkdir -p /mnt/huge
 mount -t hugetlbfs nodev /mnt/huge
 
+"`dirname "$0"`"/build_${ARCH}.sh
+
+cd "$(dirname "$0")"/../..
+
 ODP_SCHEDULER=basic    ./test/validation/api/timer/timer_main
 ODP_SCHEDULER=sp       ./test/validation/api/timer/timer_main
 ODP_SCHEDULER=scalable ./test/validation/api/timer/timer_main
diff --git a/scripts/ci/check_pktio.sh b/scripts/ci/check_pktio.sh
index e61bacc98..3c6fd8c86 100755
--- a/scripts/ci/check_pktio.sh
+++ b/scripts/ci/check_pktio.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 set -e
 
-"`dirname "$0"`"/build_${ARCH}.sh
-
-cd "$(dirname "$0")"/../..
-
 echo 1000 | tee /proc/sys/vm/nr_hugepages
 mkdir -p /mnt/huge
 mount -t hugetlbfs nodev /mnt/huge
 
+"`dirname "$0"`"/build_${ARCH}.sh
+
+cd "$(dirname "$0")"/../..
+
 ./platform/linux-generic/test/validation/api/pktio/pktio_run.sh
 
 umount /mnt/huge
diff --git a/scripts/ci/coverage.sh b/scripts/ci/coverage.sh
index d6a8a6d0e..c59a704e1 100755
--- a/scripts/ci/coverage.sh
+++ b/scripts/ci/coverage.sh
@@ -5,6 +5,10 @@ if [ "${CC#clang}" != "${CC}" ] ; then
 	export CXX="clang++"
 fi
 
+echo 1000 | tee /proc/sys/vm/nr_hugepages
+mkdir -p /mnt/huge
+mount -t hugetlbfs nodev /mnt/huge
+
 cd "$(dirname "$0")"/../..
 ./bootstrap
 ./configure \
@@ -13,10 +17,6 @@ cd "$(dirname "$0")"/../..
 export CCACHE_DISABLE=1
 make -j $(nproc)
 
-echo 1000 | tee /proc/sys/vm/nr_hugepages
-mkdir -p /mnt/huge
-mount -t hugetlbfs nodev /mnt/huge
-
 # Ignore possible failures there because these tests depends on measurements
 # and systems might differ in performance.
 export CI="true"
-- 
cgit v1.2.3