Option to run cord-tester setup in foreground.
Delete relay configuration instead of restarting onos after tests.
Make sure prerequisites can be run on other ubuntu distros
Change-Id: Ic04a5dab41b013088cda651afe32abae8030c8d8
diff --git a/src/test/setup/prerequisites.sh b/src/test/setup/prerequisites.sh
index efa374c..1bfb6dd 100755
--- a/src/test/setup/prerequisites.sh
+++ b/src/test/setup/prerequisites.sh
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
apt-get update
on_cord=0
+release=$(lsb_release -cs)
if [ "$1" = "--cord" ]; then
echo "Skipping installation of Docker and ONOS"
on_cord=1
@@ -9,7 +10,7 @@
apt-get -y install apt-transport-https ca-certificates
apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
if [ ! -f /etc/apt/sources.list.d/docker.list ]; then
- echo deb https://apt.dockerproject.org/repo ubuntu-trusty main | tee /etc/apt/sources.list.d/docker.list
+ echo deb https://apt.dockerproject.org/repo ubuntu-$release main | tee /etc/apt/sources.list.d/docker.list
fi
apt-get update
apt-get purge lxc-docker || true