Skip to content

Commit

Permalink
vm: ram: double amount when GCOV is used
Browse files Browse the repository at this point in the history
The CI reported some issue when extracting GCOV files:

  https://github.com/multipath-tcp/mptcp_net-next/actions/runs/11491898749

It looks like the SWAP is being used.

We have 16GB on GitHub Actions, no need to limit the RAM to only 2GB.

Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
  • Loading branch information
matttbe committed Oct 24, 2024
1 parent 0d1ee95 commit fd10ed7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
5 changes: 4 additions & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ set_trace_on
: "${INPUT_SELFTESTS_MPTCP_LIB_OVERRIDE_FLAKY:=0}"
: "${INPUT_SELFTESTS_MPTCP_LIB_COLOR_FORCE:=1}"
: "${INPUT_CPUS:=""}"
: "${INPUT_RAM:=""}"
: "${INPUT_GCOV:=""}"
: "${INPUT_CI_RESULTS_DIR:=""}"
: "${INPUT_CI_PRINT_EXIT_CODE:=1}"
Expand Down Expand Up @@ -109,7 +110,6 @@ VIRTME_RUN="virtme-run"
VIRTME_RUN_OPTS=(
--arch "${VIRTME_ARCH}"
--name "mptcpdev" # hostname
--memory 2048M
--mods=auto
--rw # Don't use "rwdir", it will use 9p ; in a container, we can use rw
--pwd
Expand Down Expand Up @@ -285,9 +285,12 @@ setup_env() { local mode
VIRTME_RUN_OPTS+=("--net")
fi

: "${INPUT_RAM:="$((2048 * (1 + INPUT_GCOV)))M"}" # More needed for GCOV, not to swap

VIRTME_RUN_OPTS+=(
--kdir "${VIRTME_BUILD_DIR}"
--cpus "${INPUT_CPUS}"
--memory "${INPUT_RAM}"
)

OUTPUT_VIRTME="${RESULTS_DIR}/output.log"
Expand Down
1 change: 1 addition & 0 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ docker run \
-e "INPUT_EXPECT_TIMEOUT" \
-e "INPUT_EXTRA_ENV" \
-e "INPUT_CPUS" \
-e "INPUT_RAM" \
-e "INPUT_GCOV" \
-e "VIRTME_ARCH" \
-e "COMPILER" \
Expand Down

0 comments on commit fd10ed7

Please sign in to comment.