Add hc2vpp-csit jobs on Ubuntu16.04

 - add integration and verify job using Ubuntu16.04
 - pass OS parameter to test scripts

requires commit https://gerrit.fd.io/r/#/c/5037/ in CSIT

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

diff --git a/jjb/hc2vpp/csit-hc2vpp.yaml b/jjb/hc2vpp/csit-hc2vpp.yaml
index 1e70c32..145952f 100644 (file)
--- a/jjb/hc2vpp/csit-hc2vpp.yaml
+++ b/jjb/hc2vpp/csit-hc2vpp.yaml
@@ -16,12 +16,14 @@
     os:
         - ubuntu1404:
             repo-os-part: 'ubuntu.trusty.main'
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
 
 - job-template:
     name: 'hc2vpp-csit-integration-{stream}-{os}'
 
     project-type: freestyle
-    node: 'ubuntu1404-basebuild-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -78,7 +80,7 @@
     name: 'hc2vpp-csit-verify-{stream}-{os}'
 
     project-type: maven
-    node: 'ubuntu1404-basebuild-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
     concurrent: true
 

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh
index 915ca8c..14ce670 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh
@@ -25,9 +25,9 @@ else
     chmod +x bootstrap-hc2vpp-integration.sh
     # run the script
     if [ ${STREAM} == 'master' ]; then
-        ./bootstrap-hc2vpp-integration.sh ${STREAM}
+        ./bootstrap-hc2vpp-integration.sh ${STREAM} ${OS}
     else
-        ./bootstrap-hc2vpp-integration.sh 'stable.'${STREAM}
+        ./bootstrap-hc2vpp-integration.sh 'stable.'${STREAM} ${OS}
     fi
 fi
 

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
index f3c3bb0..0384a46 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh
@@ -23,9 +23,9 @@ fi
 cd csit
 
 if [ ${STREAM} == 'master' ]; then
-    ./csit/resources/tools/download_hc_build_pkgs.sh ${STREAM}
+    ./csit/resources/tools/download_hc_build_pkgs.sh ${STREAM} ${OS}
 else
-    ./csit/resources/tools/download_hc_build_pkgs.sh 'stable.'${STREAM}
+    ./csit/resources/tools/download_hc_build_pkgs.sh 'stable.'${STREAM} ${OS}
 fi
 
 cd ${current_dir}

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh
index 9cfc2c5..99b8d3f 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify.sh
@@ -23,7 +23,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