From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 31 Aug 2017 11:14:45 +0000 (+0200)
Subject: Replaced some apt calls by apt-get calls
X-Git-Tag: v3.0.0rc~16
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F2110%2F1;p=osm%2Fdevops.git

Replaced some apt calls by apt-get calls

Change-Id: Ia9d4f7d60bbcf6d730e0b0cfc802728ed9d23a9d
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/jenkins/common/install_common b/jenkins/common/install_common
index d844bdd9..d9c1338c 100755
--- a/jenkins/common/install_common
+++ b/jenkins/common/install_common
@@ -45,4 +45,4 @@ key_location=$REPOSITORY_BASE/$RELEASE/$REPOSITORY_KEY
 
 curl $key_location | apt-key add -
 
-apt update && add-apt-repository -y "deb $REPOSITORY_BASE/$RELEASE $REPOSITORY SO UI RO osmclient openvim"
+apt-get update && add-apt-repository -y "deb $REPOSITORY_BASE/$RELEASE $REPOSITORY SO UI RO osmclient openvim"
diff --git a/jenkins/host/start_build b/jenkins/host/start_build
index 02bfcc26..f7ada68a 100755
--- a/jenkins/host/start_build
+++ b/jenkins/host/start_build
@@ -48,7 +48,7 @@ if ! container_exists $OSM_BUILD_CONTAINER; then
 	if [[ $OSM_BASE_IMAGE =~ $RE ]]; then
 		container_exec $OSM_BUILD_CONTAINER yum -y install git tar make sudo
 	else
-		container_exec $OSM_BUILD_CONTAINER apt -y install git realpath make sudo 
+		container_exec $OSM_BUILD_CONTAINER apt-get -y install git realpath make sudo 
 	fi
 	if [ ${OSM_USE_LOCAL_DEVOPS:-false} ]; then
 		container_push_devops $OSM_BUILD_CONTAINER
diff --git a/jenkins/osmclient/start_build b/jenkins/osmclient/start_build
index 2206a1a7..155fefab 100755
--- a/jenkins/osmclient/start_build
+++ b/jenkins/osmclient/start_build
@@ -34,8 +34,8 @@ fi
 
 OSM_git_checkout "$@"
 
-apt update
-apt install -y docker.io
+apt-get update
+apt-get install -y docker.io
 
 # cleanup all pre-existing builds.
 # deb pkg build fails if previous build image is present
diff --git a/jenkins/system/start_build b/jenkins/system/start_build
index 823e160a..e1b91ac8 100755
--- a/jenkins/system/start_build
+++ b/jenkins/system/start_build
@@ -23,7 +23,7 @@ OSM_JENKINS=$(dirname $HERE)
 
 INFO "Installing packages"
 apt-get update
-apt install -y lxd
+apt-get install -y lxd
 
 INFO "Configuring LXD"
 # ZFS doesn't work inside a nested container. ZFS should be configured in the host LXD.
@@ -55,9 +55,10 @@ systemctl start lxd-bridge
 
 apt-get install -y python-pip python python-pycurl charm-tools python-pytest
 
-apt install -y python-osmclient
+apt-get install -y python-osmclient
 
 export OSM_USE_LOCAL_DEVOPS=true
+echo "devops/installers/install_osm.sh --test $*"
 devops/installers/install_osm.sh --test $*
 RC=$?