diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2017-03-01 12:13:32 -0700 |
|---|---|---|
| committer | Ed Warnicke <eaw@cisco.com> | 2017-03-02 14:39:58 -0700 |
| commit | 7b91bcf627dcd2a308526725661255e2f5b020c2 (patch) | |
| tree | a6f3d892eac1562b8668fd11bb5e1ba784b9659d /jjb/vpp/vpp.yaml | |
| parent | 83dc8f82dc7f2da8a423424dc387a61b471753d6 (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: I602fb09a847bb4b0d54c5844dc4c79a27393580d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'jjb/vpp/vpp.yaml')
| -rw-r--r-- | jjb/vpp/vpp.yaml | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index bc1d5597d..8791fc7e5 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -86,6 +86,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: @@ -108,7 +110,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' @@ -139,6 +143,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: @@ -172,7 +178,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 +238,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' @@ -268,6 +278,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.ubuntu.xenial.main' - is-csit-vpp-job-parameter: is-csit-vpp-job: 'True' @@ -290,7 +302,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 @@ -325,6 +339,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.ubuntu.xenial.main' - type-parameter: type: '{type}' - is-csit-vpp-job-parameter: @@ -348,7 +364,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 |