diff options
| author |   Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-07-06 15:59:14 +0200 |
|---|---|---|
| committer | Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-07-08 08:09:25 +0000 |
| commit | 34b30a1717e1e5c65524ce2db234dc1370344c4e (patch) | |
| tree | d92cd9121b6a2c4dfa09e549dfc7768f542f38e9 /jjb/scripts/setup_vpp_ubuntu_docker_test.sh | |
| parent | cea930f9bb0d339019cb84101ee451d63c3c0368 (diff) | |
Unify arm and x86 vpp jobs
There are two sets of scripts doing basically the same thing,
one set for arm and one for x86. Use the same scripts for both
x86 and arm jobs, remove the unnecessary ones and update the scripts
so that they work on both architectures.
Change-Id: Ie9c29578d0f6af41e65c0f4723bc248e664cb8dd
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Diffstat (limited to 'jjb/scripts/setup_vpp_ubuntu_docker_test.sh')
| -rw-r--r-- | jjb/scripts/setup_vpp_ubuntu_docker_test.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh index fe6a0fcb..bdc1257f 100644 --- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh +++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh @@ -16,7 +16,7 @@ if ! [ -z ${DOCKER_TEST} ] ; then # framework.VppTestCase.MIN_REQ_SHM + (num_cores * framework.VppTestCase.SHM_PER_PROCESS) # 1073741824 == 1024M (1073741824 >> 20) MEM=1024M - if [[ $(uname -m) == 'aarch64' ]] + if [[ ${MAKE_PARALLEL_JOBS} == '16' ]] then # arm build are running with 16 cores, empirical evidence shows # that 2048M is enough |