CSIT-484: Fix issues in csit-hc2vpp jobs

Use workspace/csit directory for artifacts, to mirror the way
csit-vpp jobs archive artifacts.

Don't look for honeycomb.log in /var/log, it is copied from virl
to workspace/csit directiry.

Modify trigger for hc2vpp-csit-verify, so that the trigger is not
a part of the job's name.

Change-Id: Ie1e66e9c7b017045c2be6c976189297c27e6aa96
Signed-off-by: selias <samelias@cisco.com>

diff --git a/jjb/hc2vpp/csit-hc2vpp.yaml b/jjb/hc2vpp/csit-hc2vpp.yaml
index aa7cbab..f76d9b1 100644 (file)
--- a/jjb/hc2vpp/csit-hc2vpp.yaml
+++ b/jjb/hc2vpp/csit-hc2vpp.yaml
@@ -64,13 +64,13 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml, /var/log/honeycomb/honeycomb.log'
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
             latest-only: false
         - email-notification:
             email-prefix: '[hc2vpp]'
 
         - robot-report:
-            output-path: ''
+            output-path: 'csit'
 
 - job-template:
     name: 'hc2vpp-csit-verify-{stream}-{os}'
@@ -111,7 +111,7 @@
             server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
-                    comment-contains-value: 'csit-verify'
+                    comment-contains-value: 'verify-csit$'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -148,10 +148,10 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml, /var/log/honeycomb/honeycomb.log'
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
             latest-only: false
         - email-notification:
             email-prefix: '[hc2vpp]'
 
         - robot-report:
-            output-path: ''
+            output-path: 'csit'

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
index df2e4af..62b495e 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -xeu -o pipefail
 
+current_dir = `pwd`
+cd ${WORKSPACE}
+
 # Clone csit and run package download script
 git clone https://gerrit.fd.io/r/csit --branch master
 
@@ -10,4 +13,6 @@ if [ $? != 0 ]; then
     exit
 fi
 
-./resources/tools/download_hc_build_pkgs.sh
+./csit/resources/tools/download_hc_build_pkgs.sh
+
+cd ${current_dir}

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh
index cb75c23..9cfc2c5 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh
@@ -5,15 +5,15 @@ set -xeu -o pipefail
 if [ "${OS}" == "ubuntu1404" ]; then
 
     ./packaging/deb/trusty/debuild.sh
-    cp ./packaging/deb/trusty/*.deb ./
+    cp ./packaging/deb/trusty/*.deb ${WORKSPACE}/csit
 
 elif [ "${OS}" == "ubuntu1604" ]; then
 
     ./packaging/deb/xenial/debuild.sh
-    cp ./packaging/deb/xenial/*.deb ./
+    cp ./packaging/deb/xenial/*.deb ${WORKSPACE}/csit
 fi
 
-cd csit
+cd ${WORKSPACE}/csit
 # execute csit bootstrap script if it exists
 if [ ! -e bootstrap-hc2vpp-verify.sh ]
 then