diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2017-03-01 12:13:32 -0700 |
|---|---|---|
| committer | Ed Warnicke <eaw@cisco.com> | 2017-03-01 12:24:38 -0700 |
| commit | 149bea0a7637967d625995ed0ee10c8575009e7a (patch) | |
| tree | d810d10b9995aa661f62ff66a556ac146b4ca425 /jjb/vpp/vpp.yaml | |
| parent | ff7e9579cdf0647a15b3fdd893e7a1348c9f4c8b (diff) | |
Fix vpp merge jobs
This patch switches to installing the vpp-dpkg-dev whenever
possible rather than building it. This means no duplicative
pushing of vpp-dpkg-dev, which should fix the merge jobs.
It also should mean faster vpp builds since we generally
won't need to build DPDK either.
Change-Id: I8a892b053989d0c95e0605e8dc54a6b7a205dc0c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'jjb/vpp/vpp.yaml')
| -rw-r--r-- | jjb/vpp/vpp.yaml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index bc1d5597d..060cf5139 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -108,7 +108,9 @@ - shell: !include-raw-escape: include-raw-vpp-test-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh publishers: - archive: artifacts: 'build-root/*.rpm,build-root/*.deb' @@ -172,7 +174,9 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh publishers: - fdio-infra-shiplogs: @@ -230,7 +234,9 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' @@ -290,7 +296,9 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh - shell: !include-raw-escape: include-raw-vpp-csit-functional.sh @@ -348,7 +356,9 @@ builders: - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh - shell: !include-raw-escape: include-raw-vpp-csit-verify-perf.sh |