diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 1e13852c819e96b657a24e50f11a9ad49cc33fca..f9031750c42492ff3f3a584a4f7194494d1f972a 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 2cee8628997ff5f0a42a6952d122725bd92bd15f..3e99fa845aad0ccdbe2fba1eabac979977ddc4e5 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