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>

diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml
index d49ec01..2006984 100644 (file)
--- 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 8e4420a..30232f6 100644 (file)
--- 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