use local devops for installation 16/2316/1
authorMike Marchetti <mmarchetti@sandvine.com>
Fri, 29 Sep 2017 20:14:11 +0000 (16:14 -0400)
committerMike Marchetti <mmarchetti@sandvine.com>
Fri, 29 Sep 2017 20:14:11 +0000 (16:14 -0400)
Change-Id: I9570594351a1dc83d75ee49911c26071e09a52c3
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
installers/install_osm.sh
jenkins/common/install_common

index 1e13852..f903175 100755 (executable)
@@ -369,6 +369,8 @@ lxd --version &>/dev/null || FATAL "lxd not present, exiting."
 
 wget -q -O- https://osm-download.etsi.org/ftp/osm-2.0-two/README.txt &> /dev/null
 
+# use local devops for containers
+export OSM_USE_LOCAL_DEVOPS=true
 if [ -z "$INSTALL_FROM_SOURCE" ]; then
     echo -e "\nCreating the containers and installing from binaries ..."
     $OSM_DEVOPS/jenkins/host/install RO $REPOSITORY $RELEASE $REPOSITORY_KEY $REPOSITORY_BASE || FATAL "RO install failed"
index 2cee862..3e99fa8 100755 (executable)
@@ -35,9 +35,6 @@ while getopts ":r:k:u:R:" o; do
         u)
             REPOSITORY_BASE=${OPTARG}
             ;;
-        *)
-            exit 1
-            ;;
     esac
 done