From d1e08b9b92f83e299f84f6ae2117111ec8999a21 Mon Sep 17 00:00:00 2001
From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Fri, 29 Sep 2017 16:14:11 -0400
Subject: [PATCH] use local devops for installation
Change-Id: I9570594351a1dc83d75ee49911c26071e09a52c3
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
---
installers/install_osm.sh | 2 ++
jenkins/common/install_common | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 1e13852c..f9031750 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -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"
diff --git a/jenkins/common/install_common b/jenkins/common/install_common
index 2cee8628..3e99fa84 100755
--- a/jenkins/common/install_common
+++ b/jenkins/common/install_common
@@ -35,9 +35,6 @@ while getopts ":r:k:u:R:" o; do
u)
REPOSITORY_BASE=${OPTARG}
;;
- *)
- exit 1
- ;;
esac
done
--
GitLab