Merge "Configure CSIT Jenkins view"

[ci-management.git] / jjb / hc2vpp / include-raw-hc2vpp-csit-verify.sh

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh
index cb75c23..227df6f 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh
@@ -2,18 +2,10 @@
 set -xeu -o pipefail
 
 # create HC .deb packages
-if [ "${OS}" == "ubuntu1404" ]; then
+./packaging/deb/xenial/debuild.sh
+cp ./packaging/deb/xenial/*.deb ${WORKSPACE}/csit
 
-    ./packaging/deb/trusty/debuild.sh
-    cp ./packaging/deb/trusty/*.deb ./
-
-elif [ "${OS}" == "ubuntu1604" ]; then
-
-    ./packaging/deb/xenial/debuild.sh
-    cp ./packaging/deb/xenial/*.deb ./
-fi
-
-cd csit
+cd ${WORKSPACE}/csit
 # execute csit bootstrap script if it exists
 if [ ! -e bootstrap-hc2vpp-verify.sh ]
 then
@@ -23,7 +15,7 @@ else
     # make sure that bootstrap.sh is executable
     chmod +x bootstrap-hc2vpp-verify.sh
     # run the script
-    ./bootstrap-hc2vpp-verify.sh
+    ./bootstrap-hc2vpp-verify.sh ${OS}
 fi
 
 # vim: ts=4 ts=4 sts=4 et :
\ No newline at end of file