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/vpp/vpp.yaml | |
| 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/vpp/vpp.yaml')
| -rw-r--r-- | jjb/vpp/vpp.yaml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index bfd0ddd9..0bad3f1a 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: |