summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-04-19 16:55:58 -0500
committerC.J. Collier <cjcollier@linuxfoundation.org>2016-04-20 19:59:25 +0000
commitd96ab3e5e1bee3f341b30df853a3159c4d13ce53 (patch)
treee0b8adb8e01edc7583e59708d3d809df20a5c706
parent19093d46d0222eee457dedb55505d2ad42820cfa (diff)
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>
-rw-r--r--jjb/vpp/include-raw-vpp-build.sh25
-rw-r--r--jjb/vpp/vpp.yaml1
2 files changed, 15 insertions, 11 deletions
diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index c43e94e83..d4b6d748f 100644
--- 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 fb3bfd01b..e5934562e 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -8,6 +8,7 @@
os:
- ubuntu1404
- centos7
+ - ubuntu1604
branch: 'master'
type:
- short