From 34b30a1717e1e5c65524ce2db234dc1370344c4e Mon Sep 17 00:00:00 2001 From: Juraj Linkeš Date: Mon, 6 Jul 2020 15:59:14 +0200 Subject: Unify arm and x86 vpp jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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š --- jjb/vpp/vpp.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'jjb/vpp/vpp.yaml') diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index bfd0ddd98..0bad3f1a6 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -417,13 +417,13 @@ builders: - shell: !include-raw-escape: - - ../scripts/setup_vpp_ubuntu_arm_test.sh + - ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh - shell: !include-raw-escape: - - ../scripts/vpp/arm-build.sh + - ../scripts/vpp/build.sh publishers: - fdio-infra-shiplogs: @@ -433,7 +433,7 @@ name: 'vpp-arm-merge-{stream}-{os}' project-type: freestyle - node: '{os}arm-m' + node: '{os}arm-us' build-discarder: daysToKeep: '{build-days-to-keep}' @@ -462,6 +462,7 @@ description: Artifacts to archive to the logs server. - make-parallel-jobs-parameter: make-parallel-jobs: '{make-parallel-jobs}' + - gerrit-refspec-parameter scm: - gerrit-trigger-scm: @@ -489,13 +490,16 @@ target: '/root' - shell: !include-raw-escape: - - ../scripts/setup_vpp_ubuntu_arm_test.sh + - ../scripts/vpp/checkstyle.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh - shell: !include-raw-escape: - - ../scripts/vpp/arm-build-no-test.sh + - ../scripts/vpp/build.sh - provide-maven-settings: settings-file: 'vpp-settings' @@ -934,6 +938,7 @@ description: Artifacts to archive to the logs server. - make-parallel-jobs-parameter: make-parallel-jobs: '{make-parallel-jobs}' + - gerrit-refspec-parameter scm: - gerrit-trigger-scm: -- cgit 1.2.3-korg