Support for ubuntu1604 in CI verify

This patch should enable ubuntu1604 verify in CI management.

Change-Id: I17b6e8addcfddf6cbbc3774205beecc00c4d3fcf
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index c43e94e..d4b6d74 100644 (file)
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -11,15 +11,18 @@ else
     echo $CCACHE_DIR does not exist.  This must be a new slave.
 fi
 
-if [ ${OS} == "ubuntu1404" ]; then
-    cd build-root/
-    ./bootstrap.sh
-    make PLATFORM=vpp V=0 TAG=vpp install-deb
-elif [ ${OS} == "centos7" ]; then
-    cd build-root/
-    ./bootstrap.sh
-    make PLATFORM=vpp V=0 TAG=vpp install-rpm
-else
-    echo "Unrecognized OS: ${OS}.  Please edit: https://gerrit.fd.io/r/gitweb?p=ci-management.git;a=blob;f=jjb/vpp/include-raw-vpp-build.sh;h=f3cb320bd9a2515eab0c4564c927764c9dad417d;hb=HEAD"
+SUPPORTED="ubuntu1404 ubuntu1604 centos7"
+declare -A DIST_TARGET
+DIST_TARGET=(
+    [ubuntu1404]=install-deb
+    [ubuntu1604]=install-deb
+    [centos7]=install-rpm
+)
+if [[ ! ${SUPPORTED[*]} =~ ${OS} ]]
+then
+  echo "Unrecognized OS: ${OS}.  Please edit: https://gerrit.fd.io/r/gitweb?p=ci-management.git;a=blob;f=jjb/vpp/include-raw-vpp-build.sh;hb=HEAD"
     exit 1
-fi
\ No newline at end of file
+fi
+cd build-root/
+./bootstrap.sh
+make PLATFORM=vpp V=0 TAG=vpp ${DIST_TARGET[${OS}]}
\ No newline at end of file

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index fb3bfd0..e593456 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -8,6 +8,7 @@
     os:
         - ubuntu1404
         - centos7
+        - ubuntu1604
     branch: 'master'
     type:
         - short