diff options
| author |   selias <samelias@cisco.com> | 2017-11-03 12:51:27 +0100 |
|---|---|---|
| committer | selias <samelias@cisco.com> | 2017-11-03 13:14:42 +0100 |
| commit | 9bd8654f07e4d1c95e1570382e330aebd535563a (patch) | |
| tree | 205842e82b63e2c39049d035d3f6a2987ac688fe /jjb | |
| parent | 2727e7ed36940c5522824f7002c6f609f0163b0b (diff) | |
fix prebuild script in hc2vpp-csit-verify jobs
Apply fix from https://gerrit.fd.io/r/9138 also to ODL job.
Remove honeycomb directory after HC build is done.
Change-Id: Ie25fd08427653dcaefc41263af89320ff8a4bb01
Signed-off-by: selias <samelias@cisco.com>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/hc2vpp/hc2vpp-csit.yaml | 3 | ||||
| -rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml index d49ec0180..20069843d 100644 --- a/jjb/hc2vpp/hc2vpp-csit.yaml +++ b/jjb/hc2vpp/hc2vpp-csit.yaml @@ -295,6 +295,9 @@ notbuilt: true prebuilders: + - provide-maven-settings: + settings-file: 'honeycomb-settings' + global-settings-file: 'global-settings' - shell: !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh index 8e4420a2d..30232f69c 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh @@ -31,6 +31,8 @@ if [ -n "${hc_commit_id}" ]; then exit 1 fi cd ${WORKSPACE} + # Clean up when done. Leftover build files interfere with building hc2vpp. + rm -rf honeycomb fi # TODO: Add option to build custom VPP and NSH packages |