summaryrefslogtreecommitdiffstats
path: root/jjb/vpp
diff options
context:
space:
mode:
authorjuraj.linkes <juraj.linkes@pantheon.tech>2018-12-14 17:06:15 +0100
committerjuraj.linkes <juraj.linkes@pantheon.tech>2018-12-14 17:07:51 +0100
commitc5edc46ed7a59589d970883e9a49284a79fae295 (patch)
tree9066f09b84b87a7235764af789160b8dc5722aa8 /jjb/vpp
parent44d7a73c3e365cafb8d977cbda6522e51db2fb1d (diff)
Fix arm jobs
Add the same amount of cores to merge jobs as in verify jobs. The master Bionic jobs fail without this. Also remove testing from merge jobs, which has been introduced by mistake. Change-Id: I446f99f69bb66a9a46c541542a841125ddd8111a Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>
Diffstat (limited to 'jjb/vpp')
-rw-r--r--jjb/vpp/vpp.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 51a8c028f..6f5a0e292 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -481,11 +481,13 @@
global-settings: 'global-settings'
global-settings-type: cfp
- shell:
- !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+ !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh
- shell:
!include-raw-escape:
- ../scripts/setup_vpp_dpdk_dev_env.sh
+ - include-raw-vpp-parallel-vars.sh
- include-raw-vpp-arm-build.sh
+
- provide-maven-settings:
settings-file: 'vpp-settings'
global-settings-file: 'global-settings'